d-two/operating-system
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some build errors (#146)

Browse Source 
* Fix folder

* Add tinker board to build all

* Fix download URL

* Revert uart patch

* Fix link p2

* Fix cmdline
This commit is contained in:
Pascal Vizeli
2018-08-06 00:51:12 +02:00
committed by GitHub
parent c5e85a625f
commit 1dc2392f15
9 changed files with 37 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
buildroot-external/board/tinker/patches/uboot/200-tinker-uart3-debug.patch
View File

@@ -1,71 +0,0 @@
From db6c0eae291df886af7efd46703b78b0129ecb22 Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pvizeli@syshack.ch>
Date: Fri, 3 Aug 2018 10:22:02 +0000
Subject: [PATCH 1/1] tinker uart3 debug
Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
---
arch/arm/dts/rk3288-tinker.dts | 4 ++--
arch/arm/mach-rockchip/rk3288-board-spl.c | 10 ++++++----
configs/tinker-rk3288_defconfig | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/arm/dts/rk3288-tinker.dts b/arch/arm/dts/rk3288-tinker.dts
index 3edd21cc2f4..372ab8bacdb 100644
--- a/arch/arm/dts/rk3288-tinker.dts
+++ b/arch/arm/dts/rk3288-tinker.dts
@@ -11,7 +11,7 @@
compatible = "rockchip,rk3288-tinker", "rockchip,rk3288";
chosen {
- stdout-path = &uart2;
+ stdout-path = &uart3;
};
};
@@ -41,7 +41,7 @@
status = "okay";
};
-&uart2 {
+&uart3 {
u-boot,dm-pre-reloc;
reg-shift = <2>;
};
diff --git a/arch/arm/mach-rockchip/rk3288-board-spl.c b/arch/arm/mach-rockchip/rk3288-board-spl.c
index ea6a14af4f0..8b7fa053a8d 100644
--- a/arch/arm/mach-rockchip/rk3288-board-spl.c
+++ b/arch/arm/mach-rockchip/rk3288-board-spl.c
@@ -154,10 +154,12 @@ void board_init_f(ulong dummy)
#define GRF_BASE 0xff770000
struct rk3288_grf * const grf = (void *)GRF_BASE;
- rk_clrsetreg(&grf->gpio7ch_iomux, GPIO7C7_MASK << GPIO7C7_SHIFT |
- GPIO7C6_MASK << GPIO7C6_SHIFT,
- GPIO7C7_UART2DBG_SOUT << GPIO7C7_SHIFT |
- GPIO7C6_UART2DBG_SIN << GPIO7C6_SHIFT);
+ rk_clrsetreg(&grf->gpio7a_iomux,
+ GPIO7A7_MASK << GPIO7A7_SHIFT,
+ GPIO7A7_UART3GPS_SIN << GPIO7A7_SHIFT);
+ rk_clrsetreg(&grf->gpio7b_iomux,
+ GPIO7B0_MASK << GPIO7B0_SHIFT,
+ GPIO7B0_UART3GPS_SOUT << GPIO7B0_SHIFT);
/*
* Debug UART can be used from here if required:
*
diff --git a/configs/tinker-rk3288_defconfig b/configs/tinker-rk3288_defconfig
index 679d6e29eaf..5f8da09ded8 100644
--- a/configs/tinker-rk3288_defconfig
+++ b/configs/tinker-rk3288_defconfig
@@ -5,7 +5,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_ROCKCHIP_RK3288=y
CONFIG_SPL_ROCKCHIP_BACK_TO_BROM=y
CONFIG_TARGET_TINKER_RK3288=y
-CONFIG_DEBUG_UART_BASE=0xff690000
+CONFIG_DEBUG_UART_BASE=0xff1b0000
CONFIG_DEBUG_UART_CLOCK=24000000
CONFIG_SPL_STACK_R_ADDR=0x80000
CONFIG_DEFAULT_DEVICE_TREE="rk3288-tinker"
--
2.17.1

6
buildroot-external/board/tinker/uboot-boot.sh
View File

@@ -3,7 +3,7 @@ test -n "${BOOT_A_LEFT}" || setenv BOOT_A_LEFT 3
test -n "${BOOT_B_LEFT}" || setenv BOOT_B_LEFT 3
# HassOS bootargs
setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait console=ttyS1,115200n8 console=ttyS2,115200n8"
setenv bootargs_hassos "zram.enabled=1 zram.num_devices=3 apparmor=1 security=apparmor rootwait"
# HassOS system A/B
setenv bootargs_a "root=PARTUUID=8d3d53e3-6d49-4c38-8349-aff6859e82fd rootfstype=squashfs ro"
@@ -24,14 +24,14 @@ for BOOT_SLOT in "${BOOT_ORDER}"; do
setexpr BOOT_A_LEFT ${BOOT_A_LEFT} - 1
echo "Found valid slot A, ${BOOT_A_LEFT} attempts remaining"
setenv load_kernel "ext4load mmc 1:2 ${kernel_addr_r} zImage"
setenv bootargs "${bootargs_hassos} ${bootargs_a} ${cmdline} rauc.slot=A"
setenv bootargs "${bootargs_hassos} ${bootargs_a} rauc.slot=A ${cmdline}"
fi
elif test "x${BOOT_SLOT}" = "xB"; then
if test ${BOOT_B_LEFT} -gt 0; then
setexpr BOOT_B_LEFT ${BOOT_B_LEFT} - 1
echo "Found valid slot B, ${BOOT_B_LEFT} attempts remaining"
setenv load_kernel "ext4load mmc 1:4 ${kernel_addr_r} zImage"
setenv bootargs "${bootargs_hassos} ${bootargs_b} ${cmdline} rauc.slot=B"
setenv bootargs "${bootargs_hassos} ${bootargs_b} rauc.slot=B ${cmdline}"
fi
fi
done