From 6ae66f2e892b61eda9199f5a3869b5c5c3f5544a Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 1 Aug 2014 09:28:24 +0200 Subject: sunxi: Kconfig: move common settings into a shared code block SYS_CPU, SYS_BOARD and SYS_SOC are identical for all sunxi boards, move them to a shared code block. Signed-off-by: Hans de Goede Acked-by: Ian Campbell --- board/sunxi/Kconfig | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) (limited to 'board') diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index b06b5e0..24cca47 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -1,17 +1,5 @@ if TARGET_SUN4I -config SYS_CPU - string - default "armv7" - -config SYS_BOARD - string - default "sunxi" - -config SYS_SOC - string - default "sunxi" - config SYS_CONFIG_NAME string default "sun4i" @@ -20,25 +8,21 @@ endif if TARGET_SUN5I -config SYS_CPU +config SYS_CONFIG_NAME string - default "armv7" + default "sun5i" -config SYS_BOARD - string - default "sunxi" +endif -config SYS_SOC - string - default "sunxi" +if TARGET_SUN7I config SYS_CONFIG_NAME string - default "sun5i" + default "sun7i" endif -if TARGET_SUN7I +if TARGET_SUN4I || TARGET_SUN5I || TARGET_SUN7I config SYS_CPU string @@ -52,8 +36,4 @@ config SYS_SOC string default "sunxi" -config SYS_CONFIG_NAME - string - default "sun7i" - endif -- cgit v1.1 From 846e325448ed591c4a5e8db55e2817b0ca013b0b Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 1 Aug 2014 09:37:58 +0200 Subject: sunxi: Add environment settings to make extlinux.conf booting work Automatic booting using an extlinux.conf file requires various environment variables to be set. Also modify CONFIG_SYS_LOAD_ADDR and CONFIG_STANDALONE_LOAD_ADDR to match the value chosen for kernel_addr_r, see the added comment for why the new value is chosen. Signed-off-by: Hans de Goede Acked-by: Stephen Warren --- board/sunxi/Kconfig | 3 +++ 1 file changed, 3 insertions(+) (limited to 'board') diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 24cca47..c61c650 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -36,4 +36,7 @@ config SYS_SOC string default "sunxi" +config FTDFILE + string "Default ftdfile env setting for this board" + endif -- cgit v1.1