On 1/23/23 09:39, Tony Dinh wrote:
For Kirkwood boards, it is necessary to have early malloc in DRAM area when Driver Model for Serial is enabled. This patch removes individual board settings for early malloc in various Kirkwood boards, and uses the Kirkwood commonly defined settings in arch/arm/mach-kirkwood/Kconfig.
Signed-off-by: Tony Dinh mibodhi@gmail.com
Applied to u-boot-marvell/master
Thanks, Stefan
configs/dockstar_defconfig | 3 --- configs/dreamplug_defconfig | 3 --- configs/goflexhome_defconfig | 3 --- configs/iconnect_defconfig | 3 --- configs/nsa310s_defconfig | 3 --- configs/pogo_e02_defconfig | 3 --- configs/pogo_v4_defconfig | 3 --- configs/sheevaplug_defconfig | 3 --- 8 files changed, 24 deletions(-)
diff --git a/configs/dockstar_defconfig b/configs/dockstar_defconfig index a17d01f3fd..d08182d270 100644 --- a/configs/dockstar_defconfig +++ b/configs/dockstar_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dockstar" CONFIG_SYS_PROMPT="DockStar> " CONFIG_IDENT_STRING="\nSeagate FreeAgent DockStar" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:root; ubifsload 0x800000 ${kernel}; ubifsload 0x1100000 ${initrd}; bootm 0x800000 0x1100000" diff --git a/configs/dreamplug_defconfig b/configs/dreamplug_defconfig index 6deb05575c..3cff5034b9 100644 --- a/configs/dreamplug_defconfig +++ b/configs/dreamplug_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-dreamplug" CONFIG_IDENT_STRING="\nMarvell-DreamPlug" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_ENV_ADDR=0x100000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv ethact ethernet-controller@72000; ${x_bootcmd_ethernet}; setenv ethact ethernet-controller@76000; ${x_bootcmd_ethernet}; ${x_bootcmd_usb}; ${x_bootcmd_kernel}; setenv bootargs ${x_bootargs} ${x_bootargs_root}; bootm 0x6400000;" diff --git a/configs/goflexhome_defconfig b/configs/goflexhome_defconfig index 8ee1183309..8dc285241b 100644 --- a/configs/goflexhome_defconfig +++ b/configs/goflexhome_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-goflexnet" CONFIG_SYS_PROMPT="GoFlexHome> " CONFIG_IDENT_STRING="\nSeagate GoFlex Home" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part root; ubifsmount ubi:root; ubifsload 0x800000 ${kernel}; bootm 0x800000" diff --git a/configs/iconnect_defconfig b/configs/iconnect_defconfig index f536dd3bcb..94f4ee2772 100644 --- a/configs/iconnect_defconfig +++ b/configs/iconnect_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-iconnect" CONFIG_SYS_PROMPT="iConnect> " CONFIG_IDENT_STRING=" Iomega iConnect" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs ${console} ${mtdparts} ${bootargs_root}; ubi part rootfs; ubifsmount ubi:rootfs; ubifsload 0x800000 ${kernel}; bootm 0x800000" diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig index e7d6ffd925..ab896ff54e 100644 --- a/configs/nsa310s_defconfig +++ b/configs/nsa310s_defconfig @@ -9,7 +9,6 @@ CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/zyxel/nsa310s/kwbimage.cfg" CONFIG_TEXT_BASE=0x600000 -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NSA310S=y CONFIG_ENV_SIZE=0x20000 @@ -19,8 +18,6 @@ CONFIG_SYS_PROMPT="NSA310s> " CONFIG_IDENT_STRING="\nZyXEL NSA310S/320S 1/2-Bay Power Media Server" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 CONFIG_BOOTDELAY=3 CONFIG_USE_PREBOOT=y # CONFIG_DISPLAY_BOARDINFO is not set diff --git a/configs/pogo_e02_defconfig b/configs/pogo_e02_defconfig index 116e5d0ed3..067fb9e13b 100644 --- a/configs/pogo_e02_defconfig +++ b/configs/pogo_e02_defconfig @@ -17,9 +17,6 @@ CONFIG_DEFAULT_DEVICE_TREE="kirkwood-pogo_e02" CONFIG_SYS_PROMPT="PogoE02> " CONFIG_IDENT_STRING="\nPogo E02" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="setenv bootargs $(bootargs_console); run bootcmd_usb; bootm 0x00800000 0x01100000" diff --git a/configs/pogo_v4_defconfig b/configs/pogo_v4_defconfig index 57ec6f1fb6..3860ad30d3 100644 --- a/configs/pogo_v4_defconfig +++ b/configs/pogo_v4_defconfig @@ -9,7 +9,6 @@ CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SYS_KWD_CONFIG="board/cloudengines/pogo_v4/kwbimage.cfg" CONFIG_TEXT_BASE=0x600000 -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_TARGET_POGO_V4=y CONFIG_ENV_SIZE=0x20000 CONFIG_ENV_OFFSET=0xC0000 @@ -18,8 +17,6 @@ CONFIG_SYS_PROMPT="Pogo_V4> " CONFIG_IDENT_STRING="\nPogoplug V4" CONFIG_SYS_LOAD_ADDR=0x800000 CONFIG_DISTRO_DEFAULTS=y -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 CONFIG_BOOTSTAGE=y CONFIG_SHOW_BOOT_PROGRESS=y CONFIG_BOOTDELAY=10 diff --git a/configs/sheevaplug_defconfig b/configs/sheevaplug_defconfig index 79f36c0360..cb38a3fbd5 100644 --- a/configs/sheevaplug_defconfig +++ b/configs/sheevaplug_defconfig @@ -16,9 +16,6 @@ CONFIG_ENV_OFFSET=0x80000 CONFIG_DEFAULT_DEVICE_TREE="kirkwood-sheevaplug" CONFIG_IDENT_STRING="\nMarvell-Sheevaplug" CONFIG_SYS_LOAD_ADDR=0x800000 -CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y -CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0xc8012000 -# CONFIG_SYS_MALLOC_F is not set CONFIG_HAS_BOARD_SIZE_LIMIT=y CONFIG_BOARD_SIZE_LIMIT=524288 CONFIG_BOOTDELAY=3
Viele Grüße, Stefan Roese