sunxi: Kconfig: use SoC-wide values for some symbols

Some configuration symbols formerly defined in header files were
recently converted to Kconfig symbols. This moved their value definition
into *every* defconfig file, even though those values are hardly board
choices.
Use the new Kconfig option to define per-SoC default values, in just one
place, which makes the definition in each defconfig file redundant.

We refrain from setting a sunxi specific value for CONFIG_SYS_BOOTM_LEN,
so this defaults to a much better 64MB for uncompressed arm64 kernels.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 49247a4..16030e3 100644 (file)
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -86,6 +86,7 @@ config SYS_CBSIZE
 
 config SYS_PBSIZE
        int "Buffer size for console output"
+       default 1024 if ARCH_SUNXI
        default 1044
 
 config SYS_XTRACE

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index f2422d2..b1b9e09 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -81,6 +81,7 @@ config SPL_MAX_SIZE
        default 0x10000 if ARCH_MX6 && !MX6_OCRAM_256KB
        default 0x7fa0 if SUNXI_SRAM_ADDRESS = 0x10000
        default 0x7fa0 if SUNXI_SRAM_ADDRESS = 0x20000 && !MACH_SUN50I_H616
+       default 0xbfa0 if MACH_SUN50I_H616
        default 0x7000 if RCAR_GEN3
        default 0x5fa0 if SUNXI_SRAM_ADDRESS = 0x0
        default 0x10000 if ASPEED_AST2600
@@ -353,6 +354,11 @@ config SPL_STACK
        default 0x946bb8 if ARCH_MX7
        default 0x93ffb8 if ARCH_MX6 && MX6_OCRAM_256KB
        default 0x91ffb8 if ARCH_MX6 && !MX6_OCRAM_256KB
+       default 0x118000 if MACH_SUN50I_H6
+       default 0x58000 if MACH_SUN50I_H616
+       default 0x54000 if MACH_SUN50I || MACH_SUN50I_H5
+       default 0x18000 if MACH_SUN9I
+       default 0x8000 if ARCH_SUNXI
        help
          Address of the start of the stack SPL will use before SDRAM is
          initialized.