[U-Boot] [PATCH 0/2] rockchip: fixes in config files
Hi,
This patchset fixes some issues found in Rockchip's configuration due to previuos patches that add/modified some u-boot config options.
It is built on top of Lin Huang's patchset: [PATCH v5 00/21] Bring up rk3036 uboot
Best regards,
Ariel D'Alessandro (2): rockchip: Turn on CONFIG_DEBUG_UART_NS16550 in defconfigs rockchip: move SYS_MALLOC_SIMPLE to mach-rockchip Kconfig
arch/arm/mach-rockchip/Kconfig | 3 +++ configs/chromebook_jerry_defconfig | 1 + configs/firefly-rk3288_defconfig | 3 ++- include/configs/rk3036_common.h | 4 ---- include/configs/rk3288_common.h | 4 ---- 5 files changed, 6 insertions(+), 9 deletions(-)
No UART driver was specified in defconfig, thus DEBUG_UART_ALTERA_JTAGUART was incorrectly selected by default since commit 220e8021af96741bd7149ca9895e1f0c8a38d0bb added a new Altera UART driver.
Signed-off-by: Ariel D'Alessandro ariel@vanguardiasur.com.ar --- configs/chromebook_jerry_defconfig | 1 + configs/firefly-rk3288_defconfig | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index 3ded392..5d39a9a 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -33,6 +33,7 @@ CONFIG_REGULATOR_ACT8846=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_NS16550=y CONFIG_DEBUG_UART_BASE=0xff690000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART_SHIFT=2 diff --git a/configs/firefly-rk3288_defconfig b/configs/firefly-rk3288_defconfig index edb2db2..6f42377 100644 --- a/configs/firefly-rk3288_defconfig +++ b/configs/firefly-rk3288_defconfig @@ -3,9 +3,9 @@ CONFIG_ARCH_ROCKCHIP=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_ROCKCHIP_RK3288=y CONFIG_TARGET_FIREFLY_RK3288=y +CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3288-firefly" CONFIG_SPL_STACK_R=y -CONFIG_SPL_STACK_R_ADDR=0x80000 # CONFIG_CMD_IMLS is not set # CONFIG_CMD_SETEXPR is not set CONFIG_CMD_PMIC=y @@ -34,6 +34,7 @@ CONFIG_REGULATOR_ACT8846=y CONFIG_RAM=y CONFIG_SPL_RAM=y CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART_NS16550=y CONFIG_DEBUG_UART_BASE=0xff690000 CONFIG_DEBUG_UART_CLOCK=24000000 CONFIG_DEBUG_UART_SHIFT=2
On 16 November 2015 at 04:15, Ariel D'Alessandro ariel@vanguardiasur.com.ar wrote:
No UART driver was specified in defconfig, thus DEBUG_UART_ALTERA_JTAGUART was incorrectly selected by default since commit 220e8021af96741bd7149ca9895e1f0c8a38d0bb added a new Altera UART driver.
Signed-off-by: Ariel D'Alessandro ariel@vanguardiasur.com.ar
configs/chromebook_jerry_defconfig | 1 + configs/firefly-rk3288_defconfig | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
Acked-by: Simon Glass sjg@chromium.org
On 16 November 2015 at 14:08, Simon Glass sjg@chromium.org wrote:
On 16 November 2015 at 04:15, Ariel D'Alessandro ariel@vanguardiasur.com.ar wrote:
No UART driver was specified in defconfig, thus DEBUG_UART_ALTERA_JTAGUART was incorrectly selected by default since commit 220e8021af96741bd7149ca9895e1f0c8a38d0bb added a new Altera UART driver.
Signed-off-by: Ariel D'Alessandro ariel@vanguardiasur.com.ar
configs/chromebook_jerry_defconfig | 1 + configs/firefly-rk3288_defconfig | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-rockchip, thanks!
On Mon, Nov 16, 2015 at 08:15:50AM -0300, Ariel D'Alessandro wrote:
No UART driver was specified in defconfig, thus DEBUG_UART_ALTERA_JTAGUART was incorrectly selected by default since commit 220e8021af96741bd7149ca9895e1f0c8a38d0bb added a new Altera UART driver.
Signed-off-by: Ariel D'Alessandro ariel@vanguardiasur.com.ar Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
Commit 1eb0c03c2198a7ec9de456b83dacdc4831b96cbf added SPL_SYS_MALLOC_SIMPLE Kconfig option and changed the way it is evaluated.
Thus, the definitions of CONFIG_SYS_MALLOC_SIMPLE in rk3***_common.h board configs are now incorrect because CONFIG_SPL_BUILD is enabled so CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE) will look for SPL_SYS_MALLOC_SIMPLE instead of SYS_MALLOC_SIMPLE.
This commit fix this enabling SPL_SYS_MALLOC_SIMPLE with the new Kconfig option by default in rockchip-mach.
Signed-off-by: Ariel D'Alessandro ariel@vanguardiasur.com.ar --- arch/arm/mach-rockchip/Kconfig | 3 +++ include/configs/rk3036_common.h | 4 ---- include/configs/rk3288_common.h | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 6dddbab..607cb71 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -31,6 +31,9 @@ config ROCKCHIP_MAX_INIT_SIZE config SYS_MALLOC_F default y
+config SPL_SYS_MALLOC_SIMPLE + default y + config SPL_DM default y
diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index b7f78d5..4d3610f 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -27,10 +27,6 @@ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_MEM32
-#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MALLOC_SIMPLE -#endif - #define CONFIG_SYS_TEXT_BASE 0x60000000 #define CONFIG_SYS_INIT_SP_ADDR 0x60100000 #define CONFIG_SYS_LOAD_ADDR 0x60800800 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 5ba084d..74c7ee1 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -34,10 +34,6 @@ #define CONFIG_SYS_NS16550_MEM32 #define CONFIG_SPL_BOARD_INIT
-#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_MALLOC_SIMPLE -#endif - #define CONFIG_SYS_TEXT_BASE 0x00100000 #define CONFIG_SYS_INIT_SP_ADDR 0x00100000 #define CONFIG_SYS_LOAD_ADDR 0x00800800
On 16 November 2015 at 04:15, Ariel D'Alessandro ariel@vanguardiasur.com.ar wrote:
Commit 1eb0c03c2198a7ec9de456b83dacdc4831b96cbf added SPL_SYS_MALLOC_SIMPLE Kconfig option and changed the way it is evaluated.
Thus, the definitions of CONFIG_SYS_MALLOC_SIMPLE in rk3***_common.h board configs are now incorrect because CONFIG_SPL_BUILD is enabled so CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE) will look for SPL_SYS_MALLOC_SIMPLE instead of SYS_MALLOC_SIMPLE.
This commit fix this enabling SPL_SYS_MALLOC_SIMPLE with the new Kconfig option by default in rockchip-mach.
Signed-off-by: Ariel D'Alessandro ariel@vanguardiasur.com.ar
arch/arm/mach-rockchip/Kconfig | 3 +++ include/configs/rk3036_common.h | 4 ---- include/configs/rk3288_common.h | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
On 16 November 2015 at 14:08, Simon Glass sjg@chromium.org wrote:
On 16 November 2015 at 04:15, Ariel D'Alessandro ariel@vanguardiasur.com.ar wrote:
Commit 1eb0c03c2198a7ec9de456b83dacdc4831b96cbf added SPL_SYS_MALLOC_SIMPLE Kconfig option and changed the way it is evaluated.
Thus, the definitions of CONFIG_SYS_MALLOC_SIMPLE in rk3***_common.h board configs are now incorrect because CONFIG_SPL_BUILD is enabled so CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE) will look for SPL_SYS_MALLOC_SIMPLE instead of SYS_MALLOC_SIMPLE.
This commit fix this enabling SPL_SYS_MALLOC_SIMPLE with the new Kconfig option by default in rockchip-mach.
Signed-off-by: Ariel D'Alessandro ariel@vanguardiasur.com.ar
arch/arm/mach-rockchip/Kconfig | 3 +++ include/configs/rk3036_common.h | 4 ---- include/configs/rk3288_common.h | 4 ---- 3 files changed, 3 insertions(+), 8 deletions(-)
Acked-by: Simon Glass sjg@chromium.org
Applied to u-boot-rockchip, thanks!
participants (3)
-
Ariel D'Alessandro -
Simon Glass -
Tom Rini