dm: Convert boards to Kconfig for driver model
Subsystems (7)
v3 cover dm: Convert boards to Kconfig for driver model
This series converts most boards to use Kconfig for driver model. It is based on the v1 patches but split out so that only one arch is done per patch. This makes it easier to review and test. Also since DM SPL support is not fully merged some adjustments have had to be made to allow this series to work independent of that (since I don't want to delay the Kconfig conversion any longer).
About 10 boards remain to be cleaned up and these are dealt with in a small follow-on series.
Changes in v3:
- Split out the ATMEL_PIO_PORTS change into its own patch
Changes in v2:
- Add CONFIG_SYS_MALLOC_F as well as CONFIG_SYS_MALLOC_F_LEN
Simon Glass (4):
dm: at91: Drop use of ATMEL_PIO_PORTS in the header file
dm: at91: snapper: Move driver model CONFIGs to Kconfig
dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to Kconfig
dm: Drop unused driver model config_defaults
Kconfig | 19 +++++++++++++++++++ arch/arm/cpu/armv7/exynos/Kconfig | 6 ++++++ arch/arm/cpu/armv7/omap3/Kconfig | 6 ++++++ arch/arm/cpu/armv7/tegra-common/Kconfig | 6 ++++++ arch/arm/cpu/armv7/uniphier/Kconfig | 6 ++++++ arch/arm/include/asm/arch-at91/at91_pio.h | 12 ++++-------- arch/x86/Kconfig | 6 ++++++ board/ti/am335x/Kconfig | 6 ++++++ configs/Linksprite_pcDuino3_fdt_defconfig | 2 ++ configs/am335x_igep0033_defconfig | 2 ++ configs/cm_fx6_defconfig | 2 ++ configs/cm_t335_defconfig | 2 ++ configs/gwventana_defconfig | 2 ++ configs/mx6dlsabreauto_defconfig | 2 ++ configs/mx6qsabreauto_defconfig | 2 ++ configs/mx6qsabresd_defconfig | 2 ++ configs/mx6sxsabresd_defconfig | 2 ++ configs/nokia_rx51_defconfig | 2 ++ configs/pcm051_rev1_defconfig | 2 ++ configs/pcm051_rev3_defconfig | 2 ++ configs/pengwyn_defconfig | 2 ++ configs/pepper_defconfig | 2 ++ configs/rpi_defconfig | 2 ++ configs/s5p_goni_defconfig | 2 ++ configs/sandbox_defconfig | 2 ++ configs/smdkc100_defconfig | 2 ++ configs/snapper9260_defconfig | 5 +++++ configs/snapper9g20_defconfig | 5 +++++ configs/stv0991_defconfig | 2 ++ include/config_defaults.h | 12 ------------ include/configs/cm_fx6.h | 3 --- include/configs/exynos-common.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/novena.h | 1 - include/configs/rpi.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/sandbox.h | 1 - include/configs/smdkc100.h | 3 --- include/configs/snapper9260.h | 5 ----- include/configs/stv0991.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/tegra-common.h | 1 - include/configs/ti_am335x_common.h | 1 - include/configs/ti_omap3_common.h | 1 - include/configs/uniphier.h | 2 -- include/configs/x86-common.h | 1 - 49 files changed, 107 insertions(+), 48 deletions(-)
Signature · 1 line
2.2.0.rc0.207.ga3a616c
PATCH v3 1/4 dm: at91: Drop use of ATMEL_PIO_PORTS in the header file
With driver model the number of PIO ports is defined by platform data, so remove it from the header file.
---
Changes in v3:
- Split out the ATMEL_PIO_PORTS change into its own patch
Changes in v2: None
arch/arm/include/asm/arch-at91/at91_pio.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
arch/arm/include/asm/arch-at91/at91_pio.h +4 -8
@@ -114,14 +114,10 @@ typedef union at91_pio {at91_port_t pioa;at91_port_t piob;at91_port_t pioc; -#if (ATMEL_PIO_PORTS >3 ) -at91_port_t piod; -#endif -#if (ATMEL_PIO_PORTS >4 ) -at91_port_t pioe; -#endif - } ; -at91_port_t port[ATMEL_PIO_PORTS ]; +at91_port_t piod;/* not present in all hardware */ +at91_port_t pioe;/* not present in all hardware */ + }; +at91_port_t port[5 ]; } at91_pio_t;#ifdef CONFIG_AT91_GPIO
Signature · 1 line
2.2.0.rc0.207.ga3a616c
PATCH v3 1/4 dm: at91: Drop use of ATMEL_PIO_PORTS in the header file
Quoted 4 lines · Simon Glass
With driver model the number of PIO ports is defined by platform data, so remove it from the header file.
Signed-off-by Simon Glass <[email protected]>
Quoted 34 lines
---
Changes in v3:
- Split out theATMEL_PIO_PORTSchange into its own patchChanges in v2: None
arch/arm/include/asm/arch-at91/at91_pio.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)arch/arm/include/asm/arch-at91/at91_pio.h +4
-8@@ -114,14 +114,10 @@ typedef union at91_pio {at91_port_t pioa;at91_port_t piob;at91_port_t pioc; -#if (ATMEL_PIO_PORTS >3 ) -at91_port_t piod; -#endif -#if (ATMEL_PIO_PORTS >4 ) -at91_port_t pioe; -#endif - } ; -at91_port_t port[ATMEL_PIO_PORTS ]; +at91_port_t piod;/* not present in all hardware */ +at91_port_t pioe;/* not present in all hardware */ + }; +at91_port_t port[5 ]; } at91_pio_t;#ifdef CONFIG_AT91_GPIO
PATCH v3 1/4 dm: at91: Drop use of ATMEL_PIO_PORTS in the header file
Quoted 7 lines · Andreas Bie?mann
Quoted 4 lines · Simon Glass
With driver model the number of PIO ports is defined by platform data, so remove it from the header file.
Signed-off-by Simon Glass <[email protected]>Acked-by Andreas Bie?mann <[email protected]>
Applied to u-boot-dm.
PATCH v3 2/4 dm: at91: snapper: Move driver model CONFIGs to Kconfig
In reply to Simon GlassRemove driver model CONFIGs from the board config headers and use Kconfig instead.
---
Changes in v3:
- Split out the ATMEL_PIO_PORTS change into its own patch
Changes in v2: None
configs/snapper9260_defconfig | 3 +++ configs/snapper9g20_defconfig | 3 +++ include/configs/snapper9260.h | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-)
configs/snapper9260_defconfig +3 -0
@@ -1,3 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9260" CONFIG_ARM=y CONFIG_TARGET_SNAPPER9260=y +CONFIG_DM=y +CONFIG_DM_GPIO=y +CONFIG_DM_SERIAL=y
configs/snapper9g20_defconfig +3 -0
@@ -1,3 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_ARM=y CONFIG_TARGET_SNAPPER9260=y +CONFIG_DM=y +CONFIG_DM_GPIO=y +CONFIG_DM_SERIAL=y
include/configs/snapper9260.h +0 -4
@@ -21,10 +21,6 @@#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* External Crystal, in Hz */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_DM -#define CONFIG_CMD_DM -#define CONFIG_DM_GPIO -#define CONFIG_DM_SERIAL #define CONFIG_SYS_MALLOC_F_LEN (1 << 10)/* CPU */
Signature · 1 line
2.2.0.rc0.207.ga3a616c
PATCH v3 2/4 dm: at91: snapper: Move driver model CONFIGs to Kconfig
Quoted 9 lines · Simon Glass
Remove driver model CONFIGs from the board config headers and use
Kconfiginstead.Signed-off-by Simon Glass <[email protected]>---
Changes in v3:
- Split out theATMEL_PIO_PORTSchange into its own patch
Quoted 6 lines
Changes in v2: None
configs/snapper9260_defconfig | 3 +++ configs/snapper9g20_defconfig | 3 +++ include/configs/snapper9260.h | 4 ---- 3 files changed, 6 insertions(+), 4 deletions(-)
Applied to u-boot-dm.
PATCH v3 3/4 dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to Kconfig
In reply to Simon GlassMove this option to Kconfig and update all boards.
---
Changes in v3: None
Changes in v2:
- Add CONFIG_SYS_MALLOC_F as well as CONFIG_SYS_MALLOC_F_LEN
Kconfig | 19 +++++++++++++++++++ arch/arm/cpu/armv7/exynos/Kconfig | 6 ++++++ arch/arm/cpu/armv7/omap3/Kconfig | 6 ++++++ arch/arm/cpu/armv7/tegra-common/Kconfig | 6 ++++++ arch/arm/cpu/armv7/uniphier/Kconfig | 6 ++++++ arch/x86/Kconfig | 6 ++++++ board/ti/am335x/Kconfig | 6 ++++++ configs/Linksprite_pcDuino3_fdt_defconfig | 2 ++ configs/am335x_igep0033_defconfig | 2 ++ configs/cm_fx6_defconfig | 2 ++ configs/cm_t335_defconfig | 2 ++ configs/gwventana_defconfig | 2 ++ configs/mx6dlsabreauto_defconfig | 2 ++ configs/mx6qsabreauto_defconfig | 2 ++ configs/mx6qsabresd_defconfig | 2 ++ configs/mx6sxsabresd_defconfig | 2 ++ configs/nokia_rx51_defconfig | 2 ++ configs/pcm051_rev1_defconfig | 2 ++ configs/pcm051_rev3_defconfig | 2 ++ configs/pengwyn_defconfig | 2 ++ configs/pepper_defconfig | 2 ++ configs/rpi_defconfig | 2 ++ configs/s5p_goni_defconfig | 2 ++ configs/sandbox_defconfig | 2 ++ configs/smdkc100_defconfig | 2 ++ configs/snapper9260_defconfig | 2 ++ configs/snapper9g20_defconfig | 2 ++ configs/stv0991_defconfig | 2 ++ include/configs/cm_fx6.h | 3 --- include/configs/exynos-common.h | 1 - include/configs/gw_ventana.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/mx6sxsabresd.h | 1 - include/configs/nokia_rx51.h | 1 - include/configs/novena.h | 1 - include/configs/rpi.h | 1 - include/configs/s5p_goni.h | 1 - include/configs/sandbox.h | 1 - include/configs/smdkc100.h | 3 --- include/configs/snapper9260.h | 1 - include/configs/stv0991.h | 1 - include/configs/sunxi-common.h | 1 - include/configs/tegra-common.h | 1 - include/configs/ti_am335x_common.h | 1 - include/configs/ti_omap3_common.h | 1 - include/configs/uniphier.h | 2 -- include/configs/x86-common.h | 1 - 47 files changed, 97 insertions(+), 24 deletions(-)
Kconfig +19 -0
@@ -56,6 +56,25 @@ config CC_OPTIMIZE_FOR_SIZE This option is enabled by default for U-Boot. +config SYS_MALLOC_F + bool "Enable malloc() pool before relocation" + default 0x400 + help + Before relocation memory is very limited on many platforms. Still, + we can provide a small malloc() pool if needed. Driver model in + particular needs this to operate, so that it can allocate the + initial serial device and any others that are needed. + +config SYS_MALLOC_F_LEN + hex "Size of malloc() pool before relocation" + depends on SYS_MALLOC_F + default 0x400 + help + Before relocation memory is very limited on many platforms. Still, + we can provide a small malloc() pool if needed. Driver model in + particular needs this to operate, so that it can allocate the + initial serial device and any others that are needed. + menuconfig EXPERT bool "Configure standard U-Boot features (expert users)" help
arch/arm/cpu/armv7/exynos/Kconfig +6 -0
@@ -80,6 +80,12 @@ config DM_SPI_FLASH config DM_GPIO default y if !SPL_BUILD +config SYS_MALLOC_F + default y if !SPL_BUILD + +config SYS_MALLOC_F_LEN + default 0x400 if !SPL_BUILD + source "board/samsung/smdkv310/Kconfig" source "board/samsung/trats/Kconfig" source "board/samsung/universal_c210/Kconfig"
arch/arm/cpu/armv7/omap3/Kconfig +6 -0
@@ -102,6 +102,12 @@ config DM_GPIO config DM_SERIAL default y if DM && !SPL_BUILD +config SYS_MALLOC_F + default y if DM && !SPL_BUILD + +config SYS_MALLOC_F_LEN + default 0x400 if DM && !SPL_BUILD + config SYS_SOC default "omap3"
arch/arm/cpu/armv7/tegra-common/Kconfig +6 -0
@@ -17,6 +17,12 @@ config TEGRA124 endchoice +config SYS_MALLOC_F + default y + +config SYS_MALLOC_F_LEN + default 0x1800 + config USE_PRIVATE_LIBGCC default y if SPL_BUILD
arch/arm/cpu/armv7/uniphier/Kconfig +6 -0
@@ -48,6 +48,12 @@ config DCC_MICRO_SUPPORT_CARD endchoice +config SYS_MALLOC_F + default y + +config SYS_MALLOC_F_LEN + default 0x2000 + config CMD_PINMON bool "Enable boot mode pins monitor command" default y
arch/x86/Kconfig +6 -0
@@ -76,6 +76,12 @@ config DM_GPIO config DM_SERIAL default y +config SYS_MALLOC_F + default y + +config SYS_MALLOC_F_LEN + default 0x800 + config RAMBASE hex default 0x100000
board/ti/am335x/Kconfig +6 -0
@@ -47,4 +47,10 @@ config DM_GPIO config DM_SERIAL default y if DM && !SPL_BUILD +config SYS_MALLOC_F + default y if DM && !SPL_BUILD + +config SYS_MALLOC_F_LEN + default 0x400 if DM && !SPL_BUILD + endif
configs/Linksprite_pcDuino3_fdt_defconfig +2 -0
@@ -13,3 +13,5 @@ CONFIG_OF_SEPARATE=y +S:CONFIG_DRAM_CLK=480 +S:CONFIG_DRAM_ZQ=122 +S:CONFIG_DRAM_EMR1=4 +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/am335x_igep0033_defconfig +2 -0
@@ -1,3 +1,5 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_TARGET_AM335X_IGEP0033=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/cm_fx6_defconfig +2 -0
@@ -5,3 +5,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/cm_t335_defconfig +2 -0
@@ -1,3 +1,5 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_TARGET_CM_T335=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/gwventana_defconfig +2 -0
@@ -2,3 +2,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" +S:CONFIG_ARM=y +S:CONFIG_TARGET_GW_VENTANA=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/mx6dlsabreauto_defconfig +2 -0
@@ -1,3 +1,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6DL" CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/mx6qsabreauto_defconfig +2 -0
@@ -1,3 +1,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg,MX6Q" CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/mx6qsabresd_defconfig +2 -0
@@ -1,3 +1,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128.cfg,MX6Q" CONFIG_ARM=y CONFIG_TARGET_MX6SABRESD=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/mx6sxsabresd_defconfig +2 -0
@@ -1,3 +1,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,MX6SX" CONFIG_ARM=y CONFIG_TARGET_MX6SXSABRESD=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/nokia_rx51_defconfig +2 -0
@@ -4,3 +4,5 @@ CONFIG_TARGET_NOKIA_RX51=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/pcm051_rev1_defconfig +2 -0
@@ -2,3 +2,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="REV1" +S:CONFIG_ARM=y +S:CONFIG_TARGET_PCM051=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/pcm051_rev3_defconfig +2 -0
@@ -2,3 +2,5 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="REV3" +S:CONFIG_ARM=y +S:CONFIG_TARGET_PCM051=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/pengwyn_defconfig +2 -0
@@ -1,3 +1,5 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_TARGET_PENGWYN=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/pepper_defconfig +2 -0
@@ -1,3 +1,5 @@ CONFIG_SPL=y +S:CONFIG_ARM=y +S:CONFIG_TARGET_PEPPER=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/rpi_defconfig +2 -0
@@ -1,2 +1,4 @@ CONFIG_ARM=y CONFIG_TARGET_RPI=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/s5p_goni_defconfig +2 -0
@@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_ARCH_S5PC1XX=y CONFIG_TARGET_S5P_GONI=y CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni" +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/sandbox_defconfig +2 -0
@@ -5,3 +5,5 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y CONFIG_DM=y CONFIG_DEFAULT_DEVICE_TREE="sandbox" +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/smdkc100_defconfig +2 -0
@@ -2,3 +2,5 @@ CONFIG_ARM=y CONFIG_TARGET_SMDKC100=y CONFIG_ARCH_S5PC1XX=y CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100" +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/snapper9260_defconfig +2 -0
@@ -4,3 +4,5 @@ CONFIG_TARGET_SNAPPER9260=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/snapper9g20_defconfig +2 -0
@@ -4,3 +4,5 @@ CONFIG_TARGET_SNAPPER9260=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x400
configs/stv0991_defconfig +2 -0
@@ -1,3 +1,5 @@ CONFIG_SYS_EXTRA_OPTIONS="stv0991" CONFIG_ARM=y CONFIG_TARGET_STV0991=y +CONFIG_SYS_MALLOC_F=y +CONFIG_SYS_MALLOC_F_LEN=0x2000
include/configs/cm_fx6.h +0 -3
@@ -21,10 +21,7 @@#define CONFIG_MACH_TYPE 4273#ifndef CONFIG_SPL_BUILD -#define CONFIG_CMD_GPIO - -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#endif /* Display information on boot */
include/configs/exynos-common.h +0 -1
@@ -36,7 +36,6 @@#define CONFIG_ENV_OVERWRITE /* Size of malloc() pool before and after relocation */ -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20))/* select serial console configuration */
include/configs/gw_ventana.h +0 -1
@@ -39,7 +39,6 @@/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)/* Init Functions */ #define CONFIG_BOARD_EARLY_INIT_F
include/configs/mx6sabre_common.h +0 -1
@@ -27,7 +27,6 @@#define CONFIG_DM #define CONFIG_DM_THERMAL -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#define CONFIG_IMX6_THERMAL #define CONFIG_SYS_GENERIC_BOARD
include/configs/mx6sxsabresd.h +0 -1
@@ -229,7 +229,6 @@#define CONFIG_DM #define CONFIG_DM_THERMAL -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#define CONFIG_IMX6_THERMAL #define CONFIG_CMD_FUSE
include/configs/nokia_rx51.h +0 -1
@@ -72,7 +72,6 @@#define CONFIG_UBI_SIZE (512 << 10)#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + CONFIG_UBI_SIZE + \ (128 << 10)) -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)/* * Hardware drivers
include/configs/novena.h +0 -1
@@ -116,7 +116,6 @@#define CONFIG_SYS_MEMTEST_END 0x20000000#define CONFIG_SYS_MALLOC_LEN (64 * 1024 * 1024) -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)/* SPL */ #define CONFIG_SPL_FAT_SUPPORT
include/configs/rpi.h +0 -1
@@ -46,7 +46,6 @@ CONFIG_SYS_SDRAM_SIZE - \ GENERATED_GBL_DATA_SIZE)#define CONFIG_SYS_MALLOC_LEN SZ_4M -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#define CONFIG_SYS_MEMTEST_START 0x00100000#define CONFIG_SYS_MEMTEST_END 0x00200000#define CONFIG_LOADADDR 0x00200000
include/configs/s5p_goni.h +0 -1
@@ -40,7 +40,6 @@#define CONFIG_CMDLINE_EDITING /* Size of malloc() pool before and after relocation */ -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20))/*
include/configs/sandbox.h +0 -1
@@ -60,7 +60,6 @@/* * Size of malloc() pool, before and after relocation */ -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#define CONFIG_MALLOC_F_ADDR 0x0010000#define CONFIG_SYS_MALLOC_LEN (32 << 20)/* 32MB */
include/configs/smdkc100.h +0 -3
@@ -48,9 +48,6 @@*/ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (1 << 20)) -/* Small malloc pool before relocation */ -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10) -/* * select serial console configuration */
include/configs/snapper9260.h +0 -1
@@ -21,7 +21,6 @@#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* External Crystal, in Hz */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)/* CPU */ #define CONFIG_ARCH_CPU_INIT
include/configs/stv0991.h +0 -1
@@ -28,7 +28,6 @@ (PHYS_SDRAM_1_SIZE - CONFIG_ENV_SIZE)#define CONFIG_SYS_MAXARGS 16#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024) -#define CONFIG_SYS_MALLOC_F_LEN 0x2000#define CONFIG_DM /* serial port (PL011) configuration */
include/configs/sunxi-common.h +0 -1
@@ -29,7 +29,6 @@#if !defined(CONFIG_SPL_BUILD ) && defined(CONFIG_DM )# define CONFIG_DW_SERIAL -# define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#endif /*
include/configs/tegra-common.h +0 -1
@@ -37,7 +37,6 @@* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (4 << 20)/* 4MB */ -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#define CONFIG_SYS_NONCACHED_MEMORY (1 << 20)/* 1 MiB */
include/configs/ti_am335x_common.h +0 -1
@@ -21,7 +21,6 @@#ifndef CONFIG_SPL_BUILD # define CONFIG_OMAP_SERIAL -# define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#endif #include <asm/arch/omap.h>
include/configs/ti_omap3_common.h +0 -1
@@ -20,7 +20,6 @@#ifndef CONFIG_SPL_BUILD # define CONFIG_OMAP_SERIAL -# define CONFIG_SYS_MALLOC_F_LEN (1 << 10)#endif /* The chip has SDRC controller */
include/configs/uniphier.h +0 -2
@@ -80,8 +80,6 @@#define CONFIG_SMC911X_BASE CONFIG_SUPPORT_CARD_ETHER_BASE#define CONFIG_SMC911X_32_BIT -#define CONFIG_SYS_MALLOC_F_LEN 0x2000 -/*----------------------------------------------------------------------- * MMU and Cache Setting *----------------------------------------------------------------------*/
include/configs/x86-common.h +0 -1
@@ -187,7 +187,6 @@#define CONFIG_SYS_STACK_SIZE (32 * 1024)#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE#define CONFIG_SYS_MALLOC_LEN 0x200000 -#define CONFIG_SYS_MALLOC_F_LEN (2 << 10)/* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE
Signature · 1 line
2.2.0.rc0.207.ga3a616c
PATCH v3 3/4 dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to Kconfig
Quoted 7 lines · Simon Glass
Move this option to
Kconfigand update all boards.Signed-off-by Simon Glass <[email protected]>---
Changes in v3: None
Changes in v2:
- AddCONFIG_SYS_MALLOC_Fas well asCONFIG_SYS_MALLOC_F_LEN
Applied to u-boot-dm.
PATCH v3 4/4 dm: Drop unused driver model config_defaults
In reply to Simon GlassThese are now in Kconfig so we can drop them from the header file.
---
Changes in v3: None
Changes in v2: None
include/config_defaults.h | 12 ------------ 1 file changed, 12 deletions(-)
include/config_defaults.h +0 -12
@@ -20,16 +20,4 @@#define CONFIG_ZLIB 1#define CONFIG_PARTITIONS 1 -#ifndef CONFIG_SPL_BUILD -#ifndef CONFIG_DM_WARN -#define CONFIG_DM_WARN -#endif -#ifndef CONFIG_DM_DEVICE_REMOVE -#define CONFIG_DM_DEVICE_REMOVE -#endif -#ifndef CONFIG_DM_STDIO -#define CONFIG_DM_STDIO -#endif -#endif -#endif
Signature · 1 line
2.2.0.rc0.207.ga3a616c
PATCH v3 4/4 dm: Drop unused driver model config_defaults
Quoted 10 lines · Simon Glass
These are now in
Kconfigso we can drop them from the header file.Signed-off-by Simon Glass <[email protected]>---
Changes in v3: None
Changes in v2: Noneinclude/config_defaults.h | 12 ------------ 1 file changed, 12 deletions(-)
Applied to u-boot-dm.