From 91405b7fa9a7e53f238d55a17730933f43871fc1 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 19 Mar 2015 19:42:54 +0900 Subject: malloc_f: remove redundant defalut values of CONFIG_SYS_MALLOC_F_LEN The default value of CONFIG_SYS_MALLOC_F_LEN is defined by ./Kconfig as 0x400. Each defconfig or Kconfig need not repeat the same value. Signed-off-by: Masahiro Yamada Acked-by: Stephen Warren Reviewed-by: Simon Glass Acked-by: Robert Baldyga --- configs/rpi_2_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'configs/rpi_2_defconfig') diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index b539d4a..69723d5 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -1,4 +1,3 @@ CONFIG_ARM=y CONFIG_TARGET_RPI_2=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 -- cgit v1.1 From 326a682358c16afcf2c7a9617e9811e72a1f0929 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 19 Mar 2015 19:42:55 +0900 Subject: malloc_f: enable SYS_MALLOC_F by default if DM is on This option has a bool type, not hex. Fix it and enable it if CONFIG_DM is on because Driver Model always requires malloc memory. Devices are scanned twice, before/after relocation. CONFIG_SYS_MALLOC_F should be enabled to use malloc memory before relocation. As it is board-independent, handle it globally. Signed-off-by: Masahiro Yamada Acked-by: Stephen Warren Reviewed-by: Simon Glass Acked-by: Robert Baldyga --- configs/rpi_2_defconfig | 1 - 1 file changed, 1 deletion(-) (limited to 'configs/rpi_2_defconfig') diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index 69723d5..3075321 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -1,3 +1,2 @@ CONFIG_ARM=y CONFIG_TARGET_RPI_2=y -CONFIG_SYS_MALLOC_F=y -- cgit v1.1 From ddf6bd4876a1838bdf3202b34f5a36f165c279b1 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Thu, 19 Mar 2015 19:42:56 +0900 Subject: ARM: bcm283x: merge BCM2835/BCM2836 directories into mach-bcm283x BCM2835 (used on Raspberry Pi) and BCM2836 (used on Raspberry Pi 2) are similar enough. One of the biggest differences is the ARM processor. It is reasonable to collect the source files into a single place, arch/arm/mach-bcm283x/. Signed-off-by: Masahiro Yamada Acked-by: Stephen Warren --- configs/rpi_2_defconfig | 1 + 1 file changed, 1 insertion(+) (limited to 'configs/rpi_2_defconfig') diff --git a/configs/rpi_2_defconfig b/configs/rpi_2_defconfig index 3075321..965fcae 100644 --- a/configs/rpi_2_defconfig +++ b/configs/rpi_2_defconfig @@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI_2=y -- cgit v1.1