Some improvements related to build system
Subsystems (18)
v3 cover Some improvements related to build system
- Move GENERIC_BOARD CONFIGs
- Remove arch/m68k/lib/board.c
- Clean ups CONFIG_SYS_MALLOC_F and CONFIG_SYS_MALLOC_F_LEN
- Move BCM283x code into arch/arm/mach-bcm283x
Changes in v3:
- No change. Just add Stephen's Acked-by tag
Changes in v2:
- Fix a typo s/not board-independent/board-independent/
Masahiro Yamada (7):
generic-board: move __HAVE_ARCH_GENERIC_BOARD to Kconfig
generic-board: select SYS_GENERIC_BOARD for some architectures
m68k: remove arch/m68k/lib/board.c
malloc_f: remove redundant defalut values of CONFIG_SYS_MALLOC_F_LEN
malloc_f: enable SYS_MALLOC_F by default if DM is on
ARM: bcm283x: merge BCM2835/BCM2836 directories into mach-bcm283x
ARM: bcm283x: move SoC headers to mach-bcm283x/include/mach
Kconfig | 2 +-
Makefile | 2 +-
README | 6 +-
arch/Kconfig | 26 +
arch/arc/config.mk | 3 -
arch/arc/include/asm/config.h | 1 -
arch/arm/Kconfig | 15 +-
arch/arm/Makefile | 1 +
arch/arm/config.mk | 3 -
arch/arm/cpu/arm1176/Makefile | 2 -
arch/arm/cpu/arm1176/bcm2835/Kconfig | 12 -
arch/arm/cpu/armv7/Makefile | 1 -
arch/arm/cpu/armv7/bcm2835/Makefile | 13 -
arch/arm/cpu/armv7/exynos/Kconfig | 6 -
arch/arm/cpu/armv7/omap3/Kconfig | 6 -
arch/arm/mach-bcm283x/Kconfig | 40 ++
.../{cpu/arm1176/bcm2835 => mach-bcm283x}/Makefile | 2 +-
.../include/mach}/gpio.h | 0
.../include/mach}/mbox.h | 0
.../include/mach}/sdhci.h | 0
.../include/mach}/timer.h | 0
.../include/mach}/wdog.h | 0
.../{cpu/arm1176/bcm2835 => mach-bcm283x}/init.c | 0
.../bcm2835 => mach-bcm283x}/lowlevel_init.S | 0
.../{cpu/arm1176/bcm2835 => mach-bcm283x}/mbox.c | 0
.../{cpu/arm1176/bcm2835 => mach-bcm283x}/reset.c | 0
.../{cpu/arm1176/bcm2835 => mach-bcm283x}/timer.c | 0
arch/arm/mach-tegra/Kconfig | 3 -
arch/arm/mach-uniphier/Kconfig | 6 -
arch/avr32/config.mk | 3 -
arch/blackfin/config.mk | 3 -
arch/blackfin/include/asm/config.h | 1 -
arch/m68k/config.mk | 3 -
arch/m68k/include/asm/config.h | 1 -
arch/m68k/lib/Makefile | 3 -
arch/m68k/lib/board.c | 642 ---------------------
arch/microblaze/config.mk | 1 -
arch/microblaze/include/asm/config.h | 1 -
arch/mips/config.mk | 2 -
arch/nios2/config.mk | 2 -
arch/nios2/include/asm/config.h | 1 -
arch/powerpc/config.mk | 3 -
arch/sandbox/config.mk | 5 +-
arch/x86/Kconfig | 3 -
arch/x86/config.mk | 3 -
arch/x86/include/asm/config.h | 1 -
board/amcc/canyonlands/Kconfig | 8 -
board/raspberrypi/rpi/Kconfig | 15 -
board/raspberrypi/rpi_2/Kconfig | 15 -
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 | 1 -
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_2_defconfig | 3 +-
configs/rpi_defconfig | 3 +-
configs/s5p_goni_defconfig | 2 -
configs/sandbox_defconfig | 2 -
configs/smdkc100_defconfig | 2 -
configs/snapper9260_defconfig | 2 -
configs/snapper9g20_defconfig | 2 -
configs/stv0991_defconfig | 1 -
doc/README.generic-board | 12 +-
drivers/mmc/bcm2835_sdhci.c | 4 +-
include/configs/amcore.h | 2 -
include/configs/dbau1x00.h | 1 -
include/configs/malta.h | 1 -
include/configs/pb1x00.h | 1 -
include/configs/qemu-mips.h | 1 -
include/configs/qemu-mips64.h | 1 -
include/configs/rcar-gen2-common.h | 2 -
include/configs/vct.h | 1 -
82 files changed, 89 insertions(+), 853 deletions(-)
delete mode 100644 arch/arm/cpu/arm1176/bcm2835/Kconfig
delete mode 100644 arch/arm/cpu/armv7/bcm2835/Makefile
create mode 100644 arch/arm/mach-bcm283x/Kconfig
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/Makefile (72%)
rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/gpio.h (100%)
rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/mbox.h (100%)
rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/sdhci.h (100%)
rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/timer.h (100%)
rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/wdog.h (100%)
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/init.c (100%)
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/lowlevel_init.S (100%)
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/mbox.c (100%)
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/reset.c (100%)
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/timer.c (100%)
delete mode 100644 arch/m68k/lib/board.c
delete mode 100644 board/raspberrypi/rpi/Kconfig
delete mode 100644 board/raspberrypi/rpi_2/KconfigSignature · 1 line
1.9.1
PATCH v3 1/7 generic-board: move __HAVE_ARCH_GENERIC_BOARD to Kconfig
Move the option to Kconfig renaming it to CONFIG_HAVE_GENERIC_BOARD.
Signed-off-by Masahiro Yamada <[email protected]>
---
Changes in v2: None
Makefile | 2 +- README | 6 +++--- arch/Kconfig | 14 ++++++++++++++ arch/arc/config.mk | 3 --- arch/arm/config.mk | 3 --- arch/avr32/config.mk | 3 --- arch/blackfin/config.mk | 3 --- arch/m68k/config.mk | 3 --- arch/microblaze/config.mk | 1 - arch/mips/config.mk | 2 -- arch/nios2/config.mk | 2 -- arch/powerpc/config.mk | 3 --- arch/sandbox/config.mk | 3 --- arch/x86/config.mk | 3 --- doc/README.generic-board | 12 +++++++----- 15 files changed, 25 insertions(+), 38 deletions(-)
Makefile +1 -1
@@ -1163,7 +1163,7 @@ prepare2: prepare3 outputmakefile prepare1: prepare2 $(version_h) $(timestamp_h) \ include/config/auto.conf -ifeq ($(__HAVE_ARCH_GENERIC_BOARD),) +ifeq ($(CONFIG_HAVE_GENERIC_BOARD),) ifeq ($(CONFIG_SYS_GENERIC_BOARD),y) @echo >&2 " Your architecture does not support generic board." @echo >&2 " Please undefine CONFIG_SYS_GENERIC_BOARD in your board config file."
README +3 -3
@@ -4190,9 +4190,9 @@ Configuration Settings: to this new framework over time. Defining this will disable the arch/foo/lib/board.c file and use common/board_f.c and common/board_r.c instead. To use this option your architecture - must support it (i.e. must define __HAVE_ARCH_GENERIC_BOARD in - its config.mk file). If you find problems enabling this option on - your board please report the problem and send patches! + must support it (i.e. must select HAVE_GENERIC_BOARD in arch/Kconfig). + If you find problems enabling this option on your board please report + the problem and send patches! - CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC (OMAP only) This is set by OMAP boards for the max time that reset should
arch/Kconfig +14 -0
@@ -1,3 +1,6 @@ +config HAVE_GENERIC_BOARD + bool + choice prompt "Architecture select" default SANDBOX
@@ -5,34 +8,42 @@ choice config ARC bool "ARC architecture" select HAVE_PRIVATE_LIBGCC + select HAVE_GENERIC_BOARD config ARM bool "ARM architecture" select HAVE_PRIVATE_LIBGCC + select HAVE_GENERIC_BOARD select SUPPORT_OF_CONTROL config AVR32 bool "AVR32 architecture" + select HAVE_GENERIC_BOARD config BLACKFIN bool "Blackfin architecture" + select HAVE_GENERIC_BOARD config M68K bool "M68000 architecture" + select HAVE_GENERIC_BOARD config MICROBLAZE bool "MicroBlaze architecture" + select HAVE_GENERIC_BOARD select SUPPORT_OF_CONTROL config MIPS bool "MIPS architecture" select HAVE_PRIVATE_LIBGCC + select HAVE_GENERIC_BOARD config NDS32 bool "NDS32 architecture" config NIOS2 bool "Nios II architecture" + select HAVE_GENERIC_BOARD config OPENRISC bool "OpenRISC architecture"
@@ -40,10 +51,12 @@ config OPENRISC config PPC bool "PowerPC architecture" select HAVE_PRIVATE_LIBGCC + select HAVE_GENERIC_BOARD select SUPPORT_OF_CONTROL config SANDBOX bool "Sandbox" + select HAVE_GENERIC_BOARD select SUPPORT_OF_CONTROL config SH
@@ -56,6 +69,7 @@ config SPARC config X86 bool "x86 architecture" select HAVE_PRIVATE_LIBGCC + select HAVE_GENERIC_BOARD select SUPPORT_OF_CONTROL endchoice
arch/arc/config.mk +0 -3
@@ -57,6 +57,3 @@ LDFLAGS_FINAL += -pie # Load address for standalone apps CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000 - -# Support generic board on ARC -__HAVE_ARCH_GENERIC_BOARD := y
arch/arm/config.mk +0 -3
@@ -19,9 +19,6 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections \ PLATFORM_RELFLAGS += $(call cc-option, -msoft-float) \ $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -# Support generic board on ARM -__HAVE_ARCH_GENERIC_BOARD := y - PLATFORM_CPPFLAGS += -D__ARM__ # Choose between ARM/Thumb instruction sets
arch/avr32/config.mk +0 -3
@@ -9,9 +9,6 @@ ifeq ($(CROSS_COMPILE),) CROSS_COMPILE := avr32-linux- endif -# avr32 has generic board support -__HAVE_ARCH_GENERIC_BOARD := y - CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax
arch/blackfin/config.mk +0 -3
@@ -20,9 +20,6 @@ CONFIG_BFIN_CPU := $(strip $(CONFIG_BFIN_CPU:"%"=%)) endif CONFIG_BFIN_BOOT_MODE := $(strip $(CONFIG_BFIN_BOOT_MODE:"%"=%)) -# Support generic board on Blackfin -__HAVE_ARCH_GENERIC_BOARD := y - PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic LDFLAGS_FINAL += --gc-sections
arch/m68k/config.mk +0 -3
@@ -11,9 +11,6 @@ endif CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000 -# Support generic board on m68k -__HAVE_ARCH_GENERIC_BOARD := y - PLATFORM_CPPFLAGS += -D__M68K__ PLATFORM_LDFLAGS += -n PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
arch/microblaze/config.mk +0 -1
@@ -19,4 +19,3 @@ PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__ ifeq ($(CONFIG_SPL_BUILD),) PLATFORM_CPPFLAGS += -fPIC endif -__HAVE_ARCH_GENERIC_BOARD := y
arch/mips/config.mk +0 -2
@@ -43,8 +43,6 @@ PLATFORM_CPPFLAGS += $(cpuflags-y) PLATFORM_CPPFLAGS += -D__MIPS__ -__HAVE_ARCH_GENERIC_BOARD := y - # # From Linux arch/mips/Makefile #
arch/nios2/config.mk +0 -2
@@ -17,5 +17,3 @@ PLATFORM_CPPFLAGS += -G0 LDFLAGS_FINAL += --gc-sections PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections - -__HAVE_ARCH_GENERIC_BOARD := y
arch/powerpc/config.mk +0 -3
@@ -17,9 +17,6 @@ PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections \ PLATFORM_CPPFLAGS += -D__powerpc__ -ffixed-r2 PLATFORM_LDFLAGS += -n -# Support generic board on PPC -__HAVE_ARCH_GENERIC_BOARD := y - # # When cross-compiling on NetBSD, we have to define __PPC__ or else we # will pick up a va_list declaration that is incompatible with the
arch/sandbox/config.mk +0 -3
@@ -16,9 +16,6 @@ PLATFORM_CPPFLAGS += $(shell sdl-config --cflags) endif endif -# Support generic board on sandbox -__HAVE_ARCH_GENERIC_BOARD := y - cmd_u-boot__ = $(CC) -o $@ -T u-boot.lds \ -Wl,--start-group $(u-boot-main) -Wl,--end-group \ $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map
arch/x86/config.mk +0 -3
@@ -17,9 +17,6 @@ PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_X86) PLATFORM_CPPFLAGS += -fno-dwarf2-cfi-asm PLATFORM_CPPFLAGS += -march=i386 -m32 -# Support generic board on x86 -__HAVE_ARCH_GENERIC_BOARD := y - PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions -m elf_i386
doc/README.generic-board +7 -5
@@ -44,16 +44,18 @@ The following architectures are supported now: arc arm + avr32 + blackfin + m68k + microblaze mips + nios2 powerpc sandbox x86 -If your architecture is not supported, you need to adjust your -arch/<arch>/config.mk file to include: - - __HAVE_ARCH_GENERIC_BOARD := y - +If your architecture is not supported, you need to select +HAVE_GENERIC_BOARD in arch/Kconfig and test it with a suitable board, as follows.
Signature · 1 line
1.9.1
PATCH v3 1/7 generic-board: move __HAVE_ARCH_GENERIC_BOARD to Kconfig
Quoted 7 lines · Masahiro Yamada
Move the option to
Kconfigrenaming it toCONFIG_HAVE_GENERIC_BOARD.Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Quoted 16 lines
Makefile | 2 +- README | 6 +++--- arch/Kconfig | 14 ++++++++++++++ arch/arc/config.mk | 3 --- arch/arm/config.mk | 3 --- arch/avr32/config.mk | 3 --- arch/blackfin/config.mk | 3 --- arch/m68k/config.mk | 3 --- arch/microblaze/config.mk | 1 - arch/mips/config.mk | 2 -- arch/nios2/config.mk | 2 -- arch/powerpc/config.mk | 3 --- arch/sandbox/config.mk | 3 --- arch/x86/config.mk | 3 --- doc/README.generic-board | 12 +++++++----- 15 files changed, 25 insertions(+), 38 deletions(-)
Reviewed-by Simon Glass <[email protected]>
PATCH v3 1/7 generic-board: move __HAVE_ARCH_GENERIC_BOARD to Kconfig
Quoted 26 lines · Simon Glass
Quoted 7 lines · Masahiro Yamada
Move the option to
Kconfigrenaming it toCONFIG_HAVE_GENERIC_BOARD.Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Quoted 16 lines
Makefile | 2 +- README | 6 +++--- arch/Kconfig | 14 ++++++++++++++ arch/arc/config.mk | 3 --- arch/arm/config.mk | 3 --- arch/avr32/config.mk | 3 --- arch/blackfin/config.mk | 3 --- arch/m68k/config.mk | 3 --- arch/microblaze/config.mk | 1 - arch/mips/config.mk | 2 -- arch/nios2/config.mk | 2 -- arch/powerpc/config.mk | 3 --- arch/sandbox/config.mk | 3 --- arch/x86/config.mk | 3 --- doc/README.generic-board | 12 +++++++----- 15 files changed, 25 insertions(+), 38 deletions(-)
Quoted 1 line
Reviewed-by Simon Glass <[email protected]>
Reviewed-by Alexey Brodkin <[email protected]>
PATCH v3 1/7 generic-board: move __HAVE_ARCH_GENERIC_BOARD to Kconfig
In reply to Masahiro YamadaQuoted 5 lines · Masahiro Yamada
Move the option to
Kconfigrenaming it toCONFIG_HAVE_GENERIC_BOARD.Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Simon Glass <[email protected]>Reviewed-by Alexey Brodkin <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150328/12d09176/attachment.sig>
PATCH v3 2/7 generic-board: select SYS_GENERIC_BOARD for some architectures
In reply to Masahiro YamadaWe have done with the generic board conversion for all the boards of ARC, Blackfin, M68000, MicroBlaze, MIPS, NIOS2, Sandbox, X86.
Let's select SYS_GENERIC_BOARD for those architectures, so we can tell which architecture has finished the conversion at a glance.
Signed-off-by Masahiro Yamada <[email protected]>
---
Changes in v2: None
arch/Kconfig | 12 ++++++++++++ arch/arc/include/asm/config.h | 1 - arch/blackfin/include/asm/config.h | 1 - arch/m68k/include/asm/config.h | 1 - arch/microblaze/include/asm/config.h | 1 - arch/nios2/include/asm/config.h | 1 - arch/sandbox/config.mk | 2 +- arch/x86/include/asm/config.h | 1 - include/configs/amcore.h | 2 -- include/configs/dbau1x00.h | 1 - include/configs/malta.h | 1 - include/configs/pb1x00.h | 1 - include/configs/qemu-mips.h | 1 - include/configs/qemu-mips64.h | 1 - include/configs/vct.h | 1 - 15 files changed, 13 insertions(+), 15 deletions(-)
arch/Kconfig +12 -0
@@ -1,6 +1,10 @@ config HAVE_GENERIC_BOARD bool +config SYS_GENERIC_BOARD + bool + depends on HAVE_GENERIC_BOARD + choice prompt "Architecture select" default SANDBOX
@@ -9,6 +13,7 @@ config ARC bool "ARC architecture" select HAVE_PRIVATE_LIBGCC select HAVE_GENERIC_BOARD + select SYS_GENERIC_BOARD config ARM bool "ARM architecture"
@@ -23,20 +28,24 @@ config AVR32 config BLACKFIN bool "Blackfin architecture" select HAVE_GENERIC_BOARD + select SYS_GENERIC_BOARD config M68K bool "M68000 architecture" select HAVE_GENERIC_BOARD + select SYS_GENERIC_BOARD config MICROBLAZE bool "MicroBlaze architecture" select HAVE_GENERIC_BOARD + select SYS_GENERIC_BOARD select SUPPORT_OF_CONTROL config MIPS bool "MIPS architecture" select HAVE_PRIVATE_LIBGCC select HAVE_GENERIC_BOARD + select SYS_GENERIC_BOARD config NDS32 bool "NDS32 architecture"
@@ -44,6 +53,7 @@ config NDS32 config NIOS2 bool "Nios II architecture" select HAVE_GENERIC_BOARD + select SYS_GENERIC_BOARD config OPENRISC bool "OpenRISC architecture"
@@ -57,6 +67,7 @@ config PPC config SANDBOX bool "Sandbox" select HAVE_GENERIC_BOARD + select SYS_GENERIC_BOARD select SUPPORT_OF_CONTROL config SH
@@ -70,6 +81,7 @@ config X86 bool "x86 architecture" select HAVE_PRIVATE_LIBGCC select HAVE_GENERIC_BOARD + select SYS_GENERIC_BOARD select SUPPORT_OF_CONTROL endchoice
arch/arc/include/asm/config.h +0 -1
@@ -7,7 +7,6 @@#ifndef __ASM_ARC_CONFIG_H_#define __ASM_ARC_CONFIG_H_ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_GENERIC_GLOBAL_DATA #define CONFIG_SYS_BOOT_RAMDISK_HIGH #define CONFIG_ARCH_EARLY_INIT_R
arch/blackfin/include/asm/config.h +0 -1
@@ -174,7 +174,6 @@ }#endif -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_CPUINFO #define CONFIG_ARCH_MISC_INIT
arch/m68k/include/asm/config.h +0 -1
@@ -7,7 +7,6 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_GENERIC_GLOBAL_DATA #define CONFIG_NEEDS_MANUAL_RELOC
arch/microblaze/include/asm/config.h +0 -1
@@ -12,6 +12,5 @@#endif #define CONFIG_NR_DRAM_BANKS 1 -#define CONFIG_SYS_GENERIC_BOARD #endif
arch/nios2/include/asm/config.h +0 -1
@@ -7,7 +7,6 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_SYS_GENERIC_GLOBAL_DATA #endif
arch/sandbox/config.mk +1 -1
@@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-2.0+ PLATFORM_CPPFLAGS += -D__SANDBOX__ -U_FORTIFY_SOURCE -PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM -DCONFIG_SYS_GENERIC_BOARD +PLATFORM_CPPFLAGS += -DCONFIG_ARCH_MAP_SYSMEM PLATFORM_LIBS += -lrt # Define this to avoid linking with SDL, which requires SDL libraries
arch/x86/include/asm/config.h +0 -1
@@ -7,7 +7,6 @@#ifndef _ASM_CONFIG_H_#define _ASM_CONFIG_H_ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_LMB #define CONFIG_SYS_BOOT_RAMDISK_HIGH
include/configs/amcore.h +0 -2
@@ -12,8 +12,6 @@#define CONFIG_AMCORE #define CONFIG_HOSTNAME AMCORE -#define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_MCF530x#define CONFIG_M5307
include/configs/dbau1x00.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_DBAU1X00 1#define CONFIG_SOC_AU1X00 1/* alchemy series cpu */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #ifdef CONFIG_DBAU1000
include/configs/malta.h +0 -1
@@ -14,7 +14,6 @@* System configuration */ #define CONFIG_MALTA -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DISPLAY_BOARDINFO
include/configs/pb1x00.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_PB1X00 1#define CONFIG_SOC_AU1X00 1/* alchemy series cpu */ -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #ifdef CONFIG_PB1000
include/configs/qemu-mips.h +0 -1
@@ -14,7 +14,6 @@#define CONFIG_QEMU_MIPS -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_MISC_INIT_R
include/configs/qemu-mips64.h +0 -1
@@ -14,7 +14,6 @@#define CONFIG_QEMU_MIPS -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_MISC_INIT_R
include/configs/vct.h +0 -1
@@ -25,7 +25,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_SYS_GENERIC_BOARD #define CONFIG_DISPLAY_BOARDINFO #define CPU_CLOCK_RATE 324000000/* Clock for the MIPS core */
Signature · 1 line
1.9.1
PATCH v3 2/7 generic-board: select SYS_GENERIC_BOARD for some architectures
Quoted 11 lines · Masahiro Yamada
We have done with the generic board conversion for all the boards of ARC, Blackfin, M68000, MicroBlaze, MIPS, NIOS2, Sandbox, X86.
Let's select
SYS_GENERIC_BOARDfor those architectures, so we can tell which architecture has finished the conversion at a glance.Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Quoted 16 lines
arch/Kconfig | 12 ++++++++++++ arch/arc/include/asm/config.h | 1 - arch/blackfin/include/asm/config.h | 1 - arch/m68k/include/asm/config.h | 1 - arch/microblaze/include/asm/config.h | 1 - arch/nios2/include/asm/config.h | 1 - arch/sandbox/config.mk | 2 +- arch/x86/include/asm/config.h | 1 - include/configs/amcore.h | 2 -- include/configs/dbau1x00.h | 1 - include/configs/malta.h | 1 - include/configs/pb1x00.h | 1 - include/configs/qemu-mips.h | 1 - include/configs/qemu-mips64.h | 1 - include/configs/vct.h | 1 - 15 files changed, 13 insertions(+), 15 deletions(-)
Reviewed-by Simon Glass <[email protected]>
PATCH v3 2/7 generic-board: select SYS_GENERIC_BOARD for some architectures
Quoted 30 lines · Simon Glass
Quoted 11 lines · Masahiro Yamada
We have done with the generic board conversion for all the boards of ARC, Blackfin, M68000, MicroBlaze, MIPS, NIOS2, Sandbox, X86.
Let's select
SYS_GENERIC_BOARDfor those architectures, so we can tell which architecture has finished the conversion at a glance.Signed-off-by Masahiro Yamada <[email protected]>---
Changes in v2: None
Quoted 16 lines
arch/Kconfig | 12 ++++++++++++ arch/arc/include/asm/config.h | 1 - arch/blackfin/include/asm/config.h | 1 - arch/m68k/include/asm/config.h | 1 - arch/microblaze/include/asm/config.h | 1 - arch/nios2/include/asm/config.h | 1 - arch/sandbox/config.mk | 2 +- arch/x86/include/asm/config.h | 1 - include/configs/amcore.h | 2 -- include/configs/dbau1x00.h | 1 - include/configs/malta.h | 1 - include/configs/pb1x00.h | 1 - include/configs/qemu-mips.h | 1 - include/configs/qemu-mips64.h | 1 - include/configs/vct.h | 1 - 15 files changed, 13 insertions(+), 15 deletions(-)
Quoted 1 line
Reviewed-by Simon Glass <[email protected]>
Reviewed-by Alexey Brodkin <[email protected]>
PATCH v3 2/7 generic-board: select SYS_GENERIC_BOARD for some architectures
In reply to Masahiro YamadaQuoted 9 lines · Masahiro Yamada
We have done with the generic board conversion for all the boards of ARC, Blackfin, M68000, MicroBlaze, MIPS, NIOS2, Sandbox, X86.
Let's select
SYS_GENERIC_BOARDfor those architectures, so we can tell which architecture has finished the conversion at a glance.Signed-off-by Masahiro Yamada <[email protected]>Reviewed-by Simon Glass <[email protected]>Reviewed-by Alexey Brodkin <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150328/8eba9641/attachment.sig>
PATCH v3 3/7 m68k: remove arch/m68k/lib/board.c
In reply to Masahiro YamadaAll the M68000 boards have switched to Generic Board. This file is no longer necessary.
Signed-off-by Masahiro Yamada <[email protected]>
Cc Huan Wang <[email protected]>
Cc Angelo Dureghello <[email protected]>
---
Changes in v2: None
arch/m68k/lib/Makefile | 3 - arch/m68k/lib/board.c | 642 ------------------------------------------------- 2 files changed, 645 deletions(-) delete mode 100644 arch/m68k/lib/board.c
arch/m68k/lib/Makefile +0 -3
@@ -5,9 +5,6 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifndef CONFIG_SYS_GENERIC_BOARD -obj-y += board.o -endif obj-$(CONFIG_CMD_BOOTM) += bootm.o obj-y += cache.o obj-y += interrupts.o
arch/m68k/lib/board.c deleted +0 -642
642 lines not on this page · raw message
Signature · 1 line
1.9.1
PATCH v3 3/7 m68k: remove arch/m68k/lib/board.c
Quoted 6 lines · Masahiro Yamada
All the M68000 boards have switched to Generic Board. This file is no longer necessary.
Signed-off-by Masahiro Yamada <[email protected]>Cc Huan Wang <[email protected]>Cc Angelo Dureghello <[email protected]>
Quoted 8 lines
---
Changes in v2: None
arch/m68k/lib/Makefile | 3 - arch/m68k/lib/board.c | 642 ------------------------------------------------- 2 files changed, 645 deletions(-) delete mode 100644 arch/m68k/lib/board.c
Reviewed-by Simon Glass <[email protected]>
PATCH v3 3/7 m68k: remove arch/m68k/lib/board.c
In reply to Masahiro YamadaQuoted 7 lines · Masahiro Yamada
All the M68000 boards have switched to Generic Board. This file is no longer necessary.
Signed-off-by Masahiro Yamada <[email protected]>Cc Huan Wang <[email protected]>Cc Angelo Dureghello <[email protected]>Reviewed-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150328/ae6b295d/attachment.sig>
PATCH v3 4/7 malloc_f: remove redundant defalut values of CONFIG_SYS_MALLOC_F_LEN
In reply to Masahiro YamadaThe 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 <[email protected]>
Acked-by Stephen Warren <[email protected]>
---
Changes in v2: None
arch/arm/cpu/armv7/exynos/Kconfig | 3 --- arch/arm/cpu/armv7/omap3/Kconfig | 3 --- arch/arm/mach-uniphier/Kconfig | 3 --- board/amcc/canyonlands/Kconfig | 4 ---- board/ti/am335x/Kconfig | 3 --- configs/Linksprite_pcDuino3_fdt_defconfig | 1 - configs/am335x_igep0033_defconfig | 1 - configs/cm_fx6_defconfig | 1 - configs/cm_t335_defconfig | 1 - configs/gwventana_defconfig | 1 - configs/mx6dlsabreauto_defconfig | 1 - configs/mx6qsabreauto_defconfig | 1 - configs/mx6qsabresd_defconfig | 1 - configs/mx6sxsabresd_defconfig | 1 - configs/nokia_rx51_defconfig | 1 - configs/pcm051_rev1_defconfig | 1 - configs/pcm051_rev3_defconfig | 1 - configs/pengwyn_defconfig | 1 - configs/pepper_defconfig | 1 - configs/rpi_2_defconfig | 1 - configs/rpi_defconfig | 1 - configs/s5p_goni_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/smdkc100_defconfig | 1 - configs/snapper9260_defconfig | 1 - configs/snapper9g20_defconfig | 1 - 26 files changed, 37 deletions(-)
arch/arm/cpu/armv7/exynos/Kconfig +0 -3
@@ -83,9 +83,6 @@ config DM_GPIO config SYS_MALLOC_F default y -config SYS_MALLOC_F_LEN - default 0x400 - source "board/samsung/smdkv310/Kconfig" source "board/samsung/trats/Kconfig" source "board/samsung/universal_c210/Kconfig"
arch/arm/cpu/armv7/omap3/Kconfig +0 -3
@@ -109,9 +109,6 @@ config DM_SERIAL config SYS_MALLOC_F default y if DM -config SYS_MALLOC_F_LEN - default 0x400 if DM - config SYS_SOC default "omap3"
arch/arm/mach-uniphier/Kconfig +0 -3
@@ -51,9 +51,6 @@ endchoice config SYS_MALLOC_F default y -config SYS_MALLOC_F_LEN - default 0x400 - config CMD_PINMON bool "Enable boot mode pins monitor command" default y
board/amcc/canyonlands/Kconfig +0 -4
@@ -43,8 +43,4 @@ config SYS_MALLOC_F bool default y -config SYS_MALLOC_F_LEN - hex - default 0x400 - endif
board/ti/am335x/Kconfig +0 -3
@@ -50,7 +50,4 @@ config DM_SERIAL config SYS_MALLOC_F default y if DM -config SYS_MALLOC_F_LEN - default 0x400 if DM - endif
configs/Linksprite_pcDuino3_fdt_defconfig +0 -1
@@ -14,4 +14,3 @@ CONFIG_DRAM_CLK=480 CONFIG_DRAM_ZQ=122 CONFIG_DRAM_EMR1=4 CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
configs/am335x_igep0033_defconfig +0 -1
@@ -4,4 +4,3 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_ARM=y CONFIG_TARGET_AM335X_IGEP0033=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
configs/cm_fx6_defconfig +0 -1
@@ -6,4 +6,3 @@ 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 +0 -1
@@ -2,4 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_CM_T335=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
configs/gwventana_defconfig +0 -1
@@ -3,4 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" CONFIG_ARM=y CONFIG_TARGET_GW_VENTANA=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
configs/mx6dlsabreauto_defconfig +0 -1
@@ -2,6 +2,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6 CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM=y CONFIG_DM_THERMAL=y
configs/mx6qsabreauto_defconfig +0 -1
@@ -2,6 +2,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg, CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM=y CONFIG_DM_THERMAL=y
configs/mx6qsabresd_defconfig +0 -1
@@ -2,6 +2,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128 CONFIG_ARM=y CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM=y CONFIG_DM_THERMAL=y
configs/mx6sxsabresd_defconfig +0 -1
@@ -2,6 +2,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,M CONFIG_ARM=y CONFIG_TARGET_MX6SXSABRESD=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM=y CONFIG_DM_THERMAL=y
configs/nokia_rx51_defconfig +0 -1
@@ -5,4 +5,3 @@ 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 +0 -1
@@ -3,4 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="REV1" CONFIG_ARM=y CONFIG_TARGET_PCM051=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
configs/pcm051_rev3_defconfig +0 -1
@@ -3,4 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="REV3" CONFIG_ARM=y CONFIG_TARGET_PCM051=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
configs/pengwyn_defconfig +0 -1
@@ -2,4 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_PENGWYN=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
configs/pepper_defconfig +0 -1
@@ -2,4 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_PEPPER=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
configs/rpi_2_defconfig +0 -1
@@ -1,4 +1,3 @@ CONFIG_ARM=y CONFIG_TARGET_RPI_2=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
configs/rpi_defconfig +0 -1
@@ -1,4 +1,3 @@ CONFIG_ARM=y CONFIG_TARGET_RPI=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
configs/s5p_goni_defconfig +0 -1
@@ -3,4 +3,3 @@ 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 +0 -1
@@ -6,7 +6,6 @@ CONFIG_FIT_SIGNATURE=y CONFIG_DM=y CONFIG_DEFAULT_DEVICE_TREE="sandbox" CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_CROS_EC=y CONFIG_DM_CROS_EC=y CONFIG_CROS_EC_SANDBOX=y
configs/smdkc100_defconfig +0 -1
@@ -3,4 +3,3 @@ 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 +0 -1
@@ -6,4 +6,3 @@ 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 +0 -1
@@ -6,4 +6,3 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
Signature · 1 line
1.9.1
PATCH v3 4/7 malloc_f: remove redundant defalut values of CONFIG_SYS_MALLOC_F_LEN
Quoted 28 lines · Masahiro Yamada
The default value of
CONFIG_SYS_MALLOC_F_LENis defined by ./Kconfig as0x400. Each defconfig orKconfigneed not repeat the same value.Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stephen Warren <[email protected]>---
Changes in v2: None
arch/arm/cpu/armv7/exynos/Kconfig | 3 --- arch/arm/cpu/armv7/omap3/Kconfig | 3 --- arch/arm/mach-uniphier/Kconfig | 3 --- board/amcc/canyonlands/Kconfig | 4 ---- board/ti/am335x/Kconfig | 3 --- configs/Linksprite_pcDuino3_fdt_defconfig | 1 - configs/am335x_igep0033_defconfig | 1 - configs/cm_fx6_defconfig | 1 - configs/cm_t335_defconfig | 1 - configs/gwventana_defconfig | 1 - configs/mx6dlsabreauto_defconfig | 1 - configs/mx6qsabreauto_defconfig | 1 - configs/mx6qsabresd_defconfig | 1 - configs/mx6sxsabresd_defconfig | 1 - configs/nokia_rx51_defconfig | 1 - configs/pcm051_rev1_defconfig | 1 - configs/pcm051_rev3_defconfig | 1 - configs/pengwyn_defconfig | 1 - configs/pepper_defconfig | 1 -
Quoted 9 lines
configs/rpi_2_defconfig | 1 - configs/rpi_defconfig | 1 - configs/s5p_goni_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/smdkc100_defconfig | 1 - configs/snapper9260_defconfig | 1 - configs/snapper9g20_defconfig | 1 - 26 files changed, 37 deletions(-)
Reviewed-by Simon Glass <[email protected]>
PATCH v3 4/7 malloc_f: remove redundant defalut values of CONFIG_SYS_MALLOC_F_LEN
In reply to Masahiro YamadaQuoted 5 lines · Masahiro Yamada
The default value of
CONFIG_SYS_MALLOC_F_LENis defined by ./Kconfig as0x400. Each defconfig orKconfigneed not repeat the same value.Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stephen Warren <[email protected]>
Acked-by Robert Baldyga <[email protected]>
Quoted 300 lines
---
Changes in v2: None
arch/arm/cpu/armv7/exynos/Kconfig | 3 --- arch/arm/cpu/armv7/omap3/Kconfig | 3 --- arch/arm/mach-uniphier/Kconfig | 3 --- board/amcc/canyonlands/Kconfig | 4 ---- board/ti/am335x/Kconfig | 3 --- configs/Linksprite_pcDuino3_fdt_defconfig | 1 - configs/am335x_igep0033_defconfig | 1 - configs/cm_fx6_defconfig | 1 - configs/cm_t335_defconfig | 1 - configs/gwventana_defconfig | 1 - configs/mx6dlsabreauto_defconfig | 1 - configs/mx6qsabreauto_defconfig | 1 - configs/mx6qsabresd_defconfig | 1 - configs/mx6sxsabresd_defconfig | 1 - configs/nokia_rx51_defconfig | 1 - configs/pcm051_rev1_defconfig | 1 - configs/pcm051_rev3_defconfig | 1 - configs/pengwyn_defconfig | 1 - configs/pepper_defconfig | 1 - configs/rpi_2_defconfig | 1 - configs/rpi_defconfig | 1 - configs/s5p_goni_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/smdkc100_defconfig | 1 - configs/snapper9260_defconfig | 1 - configs/snapper9g20_defconfig | 1 - 26 files changed, 37 deletions(-)arch/arm/cpu/armv7/exynos/Kconfig +0
-3@@ -83,9 +83,6 @@ config DM_GPIO config SYS_MALLOC_F default y -config SYS_MALLOC_F_LEN - default 0x400 - source "board/samsung/smdkv310/Kconfig" source "board/samsung/trats/Kconfig" source "board/samsung/universal_c210/Kconfig"arch/arm/cpu/armv7/omap3/Kconfig +0
-3@@ -109,9 +109,6 @@ config DM_SERIAL config SYS_MALLOC_F default y if DM -config SYS_MALLOC_F_LEN - default 0x400 if DM - config SYS_SOC default "omap3"arch/arm/mach-uniphier/Kconfig +0
-3@@ -51,9 +51,6 @@ endchoice config SYS_MALLOC_F default y -config SYS_MALLOC_F_LEN - default 0x400 - config CMD_PINMON bool "Enable boot mode pins monitor command" default yboard/amcc/canyonlands/Kconfig +0
-4@@ -43,8 +43,4 @@ config SYS_MALLOC_F bool default y -config SYS_MALLOC_F_LEN - hex - default 0x400 - endifboard/ti/am335x/Kconfig +0
-3@@ -50,7 +50,4 @@ config DM_SERIAL config SYS_MALLOC_F default y if DM -config SYS_MALLOC_F_LEN - default 0x400 if DM - endifconfigs/Linksprite_pcDuino3_fdt_defconfig +0
-1@@ -14,4 +14,3 @@ CONFIG_DRAM_CLK=480 CONFIG_DRAM_ZQ=122 CONFIG_DRAM_EMR1=4 CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/am335x_igep0033_defconfig +0
-1@@ -4,4 +4,3 @@ CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_ARM=y CONFIG_TARGET_AM335X_IGEP0033=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/cm_fx6_defconfig +0
-1@@ -6,4 +6,3 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/cm_t335_defconfig +0
-1@@ -2,4 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_CM_T335=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/gwventana_defconfig +0
-1@@ -3,4 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL" CONFIG_ARM=y CONFIG_TARGET_GW_VENTANA=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/mx6dlsabreauto_defconfig +0
-1@@ -2,6 +2,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/mx6dl.cfg,MX6 CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM=y CONFIG_DM_THERMAL=yconfigs/mx6qsabreauto_defconfig +0
-1@@ -2,6 +2,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qsabreauto/imximage.cfg, CONFIG_ARM=y CONFIG_TARGET_MX6QSABREAUTO=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM=y CONFIG_DM_THERMAL=yconfigs/mx6qsabresd_defconfig +0
-1@@ -2,6 +2,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sabresd/mx6q_4x_mt41j128 CONFIG_ARM=y CONFIG_TARGET_MX6SABRESD=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM=y CONFIG_DM_THERMAL=yconfigs/mx6sxsabresd_defconfig +0
-1@@ -2,6 +2,5 @@ CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6sxsabresd/imximage.cfg,M CONFIG_ARM=y CONFIG_TARGET_MX6SXSABRESD=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_DM=y CONFIG_DM_THERMAL=yconfigs/nokia_rx51_defconfig +0
-1@@ -5,4 +5,3 @@ CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/pcm051_rev1_defconfig +0
-1@@ -3,4 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="REV1" CONFIG_ARM=y CONFIG_TARGET_PCM051=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/pcm051_rev3_defconfig +0
-1@@ -3,4 +3,3 @@ CONFIG_SYS_EXTRA_OPTIONS="REV3" CONFIG_ARM=y CONFIG_TARGET_PCM051=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/pengwyn_defconfig +0
-1@@ -2,4 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_PENGWYN=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/pepper_defconfig +0
-1@@ -2,4 +2,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_PEPPER=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/rpi_2_defconfig +0
-1@@ -1,4 +1,3 @@ CONFIG_ARM=y CONFIG_TARGET_RPI_2=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/rpi_defconfig +0
-1@@ -1,4 +1,3 @@ CONFIG_ARM=y CONFIG_TARGET_RPI=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/s5p_goni_defconfig +0
-1@@ -3,4 +3,3 @@ 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=0x400configs/sandbox_defconfig +0
-1@@ -6,7 +6,6 @@ CONFIG_FIT_SIGNATURE=y CONFIG_DM=y CONFIG_DEFAULT_DEVICE_TREE="sandbox" CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400 CONFIG_CROS_EC=y CONFIG_DM_CROS_EC=y CONFIG_CROS_EC_SANDBOX=yconfigs/smdkc100_defconfig +0
-1@@ -3,4 +3,3 @@ CONFIG_TARGET_SMDKC100=y CONFIG_ARCH_S5PC1XX=y CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100" CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/snapper9260_defconfig +0
-1@@ -6,4 +6,3 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400configs/snapper9g20_defconfig +0
-1@@ -6,4 +6,3 @@ CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y CONFIG_SYS_MALLOC_F=y -CONFIG_SYS_MALLOC_F_LEN=0x400
PATCH v3 4/7 malloc_f: remove redundant defalut values of CONFIG_SYS_MALLOC_F_LEN
In reply to Masahiro YamadaQuoted 7 lines · Masahiro Yamada
The default value of
CONFIG_SYS_MALLOC_F_LENis defined by ./Kconfig as0x400. Each defconfig orKconfigneed not repeat the same value.Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stephen Warren <[email protected]>Reviewed-by Simon Glass <[email protected]>Acked-by Robert Baldyga <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150328/d7402315/attachment.sig>
PATCH v3 5/7 malloc_f: enable SYS_MALLOC_F by default if DM is on
In reply to Masahiro YamadaThis 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 <[email protected]>
Acked-by Stephen Warren <[email protected]>
---
Changes in v2:
- Fix a typo s/not board-independent/board-independent/
Kconfig | 2 +- arch/arm/cpu/armv7/exynos/Kconfig | 3 --- arch/arm/cpu/armv7/omap3/Kconfig | 3 --- arch/arm/mach-tegra/Kconfig | 3 --- arch/arm/mach-uniphier/Kconfig | 3 --- arch/x86/Kconfig | 3 --- board/amcc/canyonlands/Kconfig | 4 ---- board/ti/am335x/Kconfig | 3 --- configs/Linksprite_pcDuino3_fdt_defconfig | 1 - configs/am335x_igep0033_defconfig | 1 - configs/cm_fx6_defconfig | 1 - configs/cm_t335_defconfig | 1 - configs/mx6dlsabreauto_defconfig | 1 - configs/mx6qsabreauto_defconfig | 1 - configs/mx6qsabresd_defconfig | 1 - configs/mx6sxsabresd_defconfig | 1 - configs/nokia_rx51_defconfig | 1 - configs/pcm051_rev1_defconfig | 1 - configs/pcm051_rev3_defconfig | 1 - configs/pengwyn_defconfig | 1 - configs/pepper_defconfig | 1 - configs/rpi_2_defconfig | 1 - configs/rpi_defconfig | 1 - configs/s5p_goni_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/smdkc100_defconfig | 1 - configs/snapper9260_defconfig | 1 - configs/snapper9g20_defconfig | 1 - configs/stv0991_defconfig | 1 - include/configs/rcar-gen2-common.h | 2 -- 30 files changed, 1 insertion(+), 46 deletions(-)
Kconfig +1 -1
@@ -54,7 +54,7 @@ config CC_OPTIMIZE_FOR_SIZE config SYS_MALLOC_F bool "Enable malloc() pool before relocation" - default 0x400 + default y if DM help Before relocation memory is very limited on many platforms. Still, we can provide a small malloc() pool if needed. Driver model in
arch/arm/cpu/armv7/exynos/Kconfig +0 -3
@@ -80,9 +80,6 @@ config DM_SPI_FLASH config DM_GPIO default y -config SYS_MALLOC_F - default y - source "board/samsung/smdkv310/Kconfig" source "board/samsung/trats/Kconfig" source "board/samsung/universal_c210/Kconfig"
arch/arm/cpu/armv7/omap3/Kconfig +0 -3
@@ -106,9 +106,6 @@ config DM_GPIO config DM_SERIAL default y if DM -config SYS_MALLOC_F - default y if DM - config SYS_SOC default "omap3"
arch/arm/mach-tegra/Kconfig +0 -3
@@ -17,9 +17,6 @@ config TEGRA124 endchoice -config SYS_MALLOC_F - default y - config SYS_MALLOC_F_LEN default 0x1800
arch/arm/mach-uniphier/Kconfig +0 -3
@@ -48,9 +48,6 @@ config DCC_MICRO_SUPPORT_CARD endchoice -config SYS_MALLOC_F - default y - config CMD_PINMON bool "Enable boot mode pins monitor command" default y
arch/x86/Kconfig +0 -3
@@ -76,9 +76,6 @@ config DM_GPIO config DM_SERIAL default y -config SYS_MALLOC_F - default y - config SYS_MALLOC_F_LEN default 0x800
board/amcc/canyonlands/Kconfig +0 -4
@@ -39,8 +39,4 @@ config DM config DM_SERIAL default y -config SYS_MALLOC_F - bool - default y - endif
board/ti/am335x/Kconfig +0 -3
@@ -47,7 +47,4 @@ config DM_GPIO config DM_SERIAL default y if DM -config SYS_MALLOC_F - default y if DM - endif
configs/Linksprite_pcDuino3_fdt_defconfig +0 -1
@@ -13,4 +13,3 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 CONFIG_DRAM_ZQ=122 CONFIG_DRAM_EMR1=4 -CONFIG_SYS_MALLOC_F=y
configs/am335x_igep0033_defconfig +0 -1
@@ -3,4 +3,3 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_ARM=y CONFIG_TARGET_AM335X_IGEP0033=y -CONFIG_SYS_MALLOC_F=y
configs/cm_fx6_defconfig +0 -1
@@ -5,4 +5,3 @@ CONFIG_TARGET_CM_FX6=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y -CONFIG_SYS_MALLOC_F=y
configs/cm_t335_defconfig +0 -1
@@ -1,4 +1,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_CM_T335=y -CONFIG_SYS_MALLOC_F=y
configs/mx6dlsabreauto_defconfig +0 -1
@@ -1,6 +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_DM=y CONFIG_DM_THERMAL=y
configs/mx6qsabreauto_defconfig +0 -1
@@ -1,6 +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_DM=y CONFIG_DM_THERMAL=y
configs/mx6qsabresd_defconfig +0 -1
@@ -1,6 +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_DM=y CONFIG_DM_THERMAL=y
configs/mx6sxsabresd_defconfig +0 -1
@@ -1,6 +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_DM=y CONFIG_DM_THERMAL=y
configs/nokia_rx51_defconfig +0 -1
@@ -4,4 +4,3 @@ CONFIG_TARGET_NOKIA_RX51=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n -CONFIG_SYS_MALLOC_F=y
configs/pcm051_rev1_defconfig +0 -1
@@ -2,4 +2,3 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="REV1" CONFIG_ARM=y CONFIG_TARGET_PCM051=y -CONFIG_SYS_MALLOC_F=y
configs/pcm051_rev3_defconfig +0 -1
@@ -2,4 +2,3 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="REV3" CONFIG_ARM=y CONFIG_TARGET_PCM051=y -CONFIG_SYS_MALLOC_F=y
configs/pengwyn_defconfig +0 -1
@@ -1,4 +1,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_PENGWYN=y -CONFIG_SYS_MALLOC_F=y
configs/pepper_defconfig +0 -1
@@ -1,4 +1,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_PEPPER=y -CONFIG_SYS_MALLOC_F=y
configs/rpi_2_defconfig +0 -1
@@ -1,3 +1,2 @@ CONFIG_ARM=y CONFIG_TARGET_RPI_2=y -CONFIG_SYS_MALLOC_F=y
configs/rpi_defconfig +0 -1
@@ -1,3 +1,2 @@ CONFIG_ARM=y CONFIG_TARGET_RPI=y -CONFIG_SYS_MALLOC_F=y
configs/s5p_goni_defconfig +0 -1
@@ -2,4 +2,3 @@ CONFIG_ARM=y CONFIG_ARCH_S5PC1XX=y CONFIG_TARGET_S5P_GONI=y CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni" -CONFIG_SYS_MALLOC_F=y
configs/sandbox_defconfig +0 -1
@@ -5,7 +5,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y CONFIG_DM=y CONFIG_DEFAULT_DEVICE_TREE="sandbox" -CONFIG_SYS_MALLOC_F=y CONFIG_CROS_EC=y CONFIG_DM_CROS_EC=y CONFIG_CROS_EC_SANDBOX=y
configs/smdkc100_defconfig +0 -1
@@ -2,4 +2,3 @@ CONFIG_ARM=y CONFIG_TARGET_SMDKC100=y CONFIG_ARCH_S5PC1XX=y CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100" -CONFIG_SYS_MALLOC_F=y
configs/snapper9260_defconfig +0 -1
@@ -5,4 +5,3 @@ CONFIG_TARGET_SNAPPER9260=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y -CONFIG_SYS_MALLOC_F=y
configs/snapper9g20_defconfig +0 -1
@@ -5,4 +5,3 @@ CONFIG_TARGET_SNAPPER9260=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y -CONFIG_SYS_MALLOC_F=y
configs/stv0991_defconfig +0 -1
@@ -1,7 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="stv0991" CONFIG_ARM=y CONFIG_TARGET_STV0991=y -CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DM=y CONFIG_DM_SERIAL=y
include/configs/rcar-gen2-common.h +0 -2
@@ -35,8 +35,6 @@#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10) -/* Support File sytems */ #define CONFIG_FAT_WRITE #define CONFIG_DOS_PARTITION
Signature · 1 line
1.9.1
PATCH v3 5/7 malloc_f: enable SYS_MALLOC_F by default if DM is on
Quoted 7 lines · Masahiro Yamada
This option has a bool type, not hex.
Fix it and enable it ifCONFIG_DMis on because Driver Model always requires malloc memory. Devices are scanned twice, before/after relocation.CONFIG_SYS_MALLOC_Fshould be enabled to use malloc memory before relocation. As it is board-independent, handle it globally.
Quoted 6 lines
Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stephen Warren <[email protected]>---
Changes in v2:
- Fix a typo s/not board-independent/board-independent/
Reviewed-by Simon Glass <[email protected]>
PATCH v3 5/7 malloc_f: enable SYS_MALLOC_F by default if DM is on
Hello Masahiro-san,
Quoted 9 lines · Simon Glass
Quoted 7 lines · Masahiro Yamada
This option has a bool type, not hex.
Fix it and enable it ifCONFIG_DMis on because Driver Model always requires malloc memory. Devices are scanned twice, before/after relocation.CONFIG_SYS_MALLOC_Fshould be enabled to use malloc memory before relocation. As it is board-independent, handle it globally.
Quoted 8 lines
Quoted 6 lines
Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stephen Warren <[email protected]>---
Changes in v2:
- Fix a typo s/not board-independent/board-independent/Reviewed-by Simon Glass <[email protected]>
I'm wondering if your series "Some improvements related to build system" is going to be applied to u-boot master branch anytime soon?
I have pending update series for ARC where I'm enabling use of Device Model. For this I need to use SYS_MALLOC_F (is required by CONFIG_DM_SERIAL).
So I'm interested in your patch " [PATCH v3 5/7] malloc_f: enable SYS_MALLOC_F by default if DM is on" in particular. Without it I'll need to add SYS_MALLOC_F in arch/arc/Kconfig.
-Alexey
PATCH v3 5/7 malloc_f: enable SYS_MALLOC_F by default if DM is on
Hi Tom,
Can you apply this series to u-boot/master soon?
It's got some Reviewed-by and Acked-by credits, and also, Alexey wants to use 5/7 to enable DM for ARC.
Thanks.
2015-03-28 5:10 GMT+09:00 Alexey Brodkin <[email protected]>:
Quoted 31 lines
Hello Masahiro-san,
Quoted 9 lines · Simon Glass
Quoted 7 lines · Masahiro Yamada
This option has a bool type, not hex.
Fix it and enable it ifCONFIG_DMis on because Driver Model always requires malloc memory. Devices are scanned twice, before/after relocation.CONFIG_SYS_MALLOC_Fshould be enabled to use malloc memory before relocation. As it is board-independent, handle it globally.Quoted 8 lines
Quoted 6 lines
Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stephen Warren <[email protected]>---
Changes in v2:
- Fix a typo s/not board-independent/board-independent/Reviewed-by Simon Glass <[email protected]>I'm wondering if your series "Some improvements related to build system" is going to be applied to u-boot master branch anytime soon?
I have pending update series for ARC where I'm enabling use of Device Model. For this I need to use
SYS_MALLOC_F(is required byCONFIG_DM_SERIAL).So I'm interested in your patch " [PATCH v3 5/7]
malloc_f: enableSYS_MALLOC_Fby default if DM is on" in particular. Without it I'll need to addSYS_MALLOC_Finarch/arc/Kconfig.
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH v3 5/7 malloc_f: enable SYS_MALLOC_F by default if DM is on
Hi,
Quoted 6 lines · Masahiro Yamada
Hi Tom,
Can you apply this series to u-boot/master soon?
It's got some Reviewed-by and Acked-by credits, and also, Alexey wants to use 5/7 to enable DM for ARC.
Sounds good!
Regards,
Simon
PATCH v3 5/7 malloc_f: enable SYS_MALLOC_F by default if DM is on
In reply to Masahiro YamadaQuoted 9 lines · Masahiro Yamada
This option has a bool type, not hex.
Fix it and enable it ifCONFIG_DMis on because Driver Model always requires malloc memory. Devices are scanned twice, before/after relocation.CONFIG_SYS_MALLOC_Fshould be enabled to use malloc memory before relocation. As it is board-independent, handle it globally.Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stephen Warren <[email protected]>
Acked-by Robert Baldyga <[email protected]>
Quoted 360 lines
---
Changes in v2:
- Fix a typo s/not board-independent/board-independent/Kconfig | 2 +- arch/arm/cpu/armv7/exynos/Kconfig | 3 --- arch/arm/cpu/armv7/omap3/Kconfig | 3 --- arch/arm/mach-tegra/Kconfig | 3 --- arch/arm/mach-uniphier/Kconfig | 3 --- arch/x86/Kconfig | 3 --- board/amcc/canyonlands/Kconfig | 4 ---- board/ti/am335x/Kconfig | 3 --- configs/Linksprite_pcDuino3_fdt_defconfig | 1 - configs/am335x_igep0033_defconfig | 1 - configs/cm_fx6_defconfig | 1 - configs/cm_t335_defconfig | 1 - configs/mx6dlsabreauto_defconfig | 1 - configs/mx6qsabreauto_defconfig | 1 - configs/mx6qsabresd_defconfig | 1 - configs/mx6sxsabresd_defconfig | 1 - configs/nokia_rx51_defconfig | 1 - configs/pcm051_rev1_defconfig | 1 - configs/pcm051_rev3_defconfig | 1 - configs/pengwyn_defconfig | 1 - configs/pepper_defconfig | 1 - configs/rpi_2_defconfig | 1 - configs/rpi_defconfig | 1 - configs/s5p_goni_defconfig | 1 - configs/sandbox_defconfig | 1 - configs/smdkc100_defconfig | 1 - configs/snapper9260_defconfig | 1 - configs/snapper9g20_defconfig | 1 - configs/stv0991_defconfig | 1 - include/configs/rcar-gen2-common.h | 2 -- 30 files changed, 1 insertion(+), 46 deletions(-)Kconfig +1
-1@@ -54,7 +54,7 @@ config CC_OPTIMIZE_FOR_SIZE config SYS_MALLOC_F bool "Enable malloc() pool before relocation" - default 0x400 + default y if DM help Before relocation memory is very limited on many platforms. Still, we can provide a small malloc() pool if needed. Driver model inarch/arm/cpu/armv7/exynos/Kconfig +0
-3@@ -80,9 +80,6 @@ config DM_SPI_FLASH config DM_GPIO default y -config SYS_MALLOC_F - default y - source "board/samsung/smdkv310/Kconfig" source "board/samsung/trats/Kconfig" source "board/samsung/universal_c210/Kconfig"arch/arm/cpu/armv7/omap3/Kconfig +0
-3@@ -106,9 +106,6 @@ config DM_GPIO config DM_SERIAL default y if DM -config SYS_MALLOC_F - default y if DM - config SYS_SOC default "omap3"arch/arm/mach-tegra/Kconfig +0
-3@@ -17,9 +17,6 @@ config TEGRA124 endchoice -config SYS_MALLOC_F - default y - config SYS_MALLOC_F_LEN default 0x1800arch/arm/mach-uniphier/Kconfig +0
-3@@ -48,9 +48,6 @@ config DCC_MICRO_SUPPORT_CARD endchoice -config SYS_MALLOC_F - default y - config CMD_PINMON bool "Enable boot mode pins monitor command" default yarch/x86/Kconfig +0
-3@@ -76,9 +76,6 @@ config DM_GPIO config DM_SERIAL default y -config SYS_MALLOC_F - default y - config SYS_MALLOC_F_LEN default 0x800board/amcc/canyonlands/Kconfig +0
-4@@ -39,8 +39,4 @@ config DM config DM_SERIAL default y -config SYS_MALLOC_F - bool - default y - endifboard/ti/am335x/Kconfig +0
-3@@ -47,7 +47,4 @@ config DM_GPIO config DM_SERIAL default y if DM -config SYS_MALLOC_F - default y if DM - endifconfigs/Linksprite_pcDuino3_fdt_defconfig +0
-1@@ -13,4 +13,3 @@ CONFIG_MACH_SUN7I=y CONFIG_DRAM_CLK=480 CONFIG_DRAM_ZQ=122 CONFIG_DRAM_EMR1=4 -CONFIG_SYS_MALLOC_F=yconfigs/am335x_igep0033_defconfig +0
-1@@ -3,4 +3,3 @@ CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_ADDR=0x82000000 CONFIG_ARM=y CONFIG_TARGET_AM335X_IGEP0033=y -CONFIG_SYS_MALLOC_F=yconfigs/cm_fx6_defconfig +0
-1@@ -5,4 +5,3 @@ CONFIG_TARGET_CM_FX6=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y -CONFIG_SYS_MALLOC_F=yconfigs/cm_t335_defconfig +0
-1@@ -1,4 +1,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_CM_T335=y -CONFIG_SYS_MALLOC_F=yconfigs/mx6dlsabreauto_defconfig +0
-1@@ -1,6 +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_DM=y CONFIG_DM_THERMAL=yconfigs/mx6qsabreauto_defconfig +0
-1@@ -1,6 +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_DM=y CONFIG_DM_THERMAL=yconfigs/mx6qsabresd_defconfig +0
-1@@ -1,6 +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_DM=y CONFIG_DM_THERMAL=yconfigs/mx6sxsabresd_defconfig +0
-1@@ -1,6 +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_DM=y CONFIG_DM_THERMAL=yconfigs/nokia_rx51_defconfig +0
-1@@ -4,4 +4,3 @@ CONFIG_TARGET_NOKIA_RX51=y CONFIG_DM=n CONFIG_DM_SERIAL=n CONFIG_DM_GPIO=n -CONFIG_SYS_MALLOC_F=yconfigs/pcm051_rev1_defconfig +0
-1@@ -2,4 +2,3 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="REV1" CONFIG_ARM=y CONFIG_TARGET_PCM051=y -CONFIG_SYS_MALLOC_F=yconfigs/pcm051_rev3_defconfig +0
-1@@ -2,4 +2,3 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="REV3" CONFIG_ARM=y CONFIG_TARGET_PCM051=y -CONFIG_SYS_MALLOC_F=yconfigs/pengwyn_defconfig +0
-1@@ -1,4 +1,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_PENGWYN=y -CONFIG_SYS_MALLOC_F=yconfigs/pepper_defconfig +0
-1@@ -1,4 +1,3 @@ CONFIG_SPL=y CONFIG_ARM=y CONFIG_TARGET_PEPPER=y -CONFIG_SYS_MALLOC_F=yconfigs/rpi_2_defconfig +0
-1@@ -1,3 +1,2 @@ CONFIG_ARM=y CONFIG_TARGET_RPI_2=y -CONFIG_SYS_MALLOC_F=yconfigs/rpi_defconfig +0
-1@@ -1,3 +1,2 @@ CONFIG_ARM=y CONFIG_TARGET_RPI=y -CONFIG_SYS_MALLOC_F=yconfigs/s5p_goni_defconfig +0
-1@@ -2,4 +2,3 @@ CONFIG_ARM=y CONFIG_ARCH_S5PC1XX=y CONFIG_TARGET_S5P_GONI=y CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-goni" -CONFIG_SYS_MALLOC_F=yconfigs/sandbox_defconfig +0
-1@@ -5,7 +5,6 @@ CONFIG_FIT_VERBOSE=y CONFIG_FIT_SIGNATURE=y CONFIG_DM=y CONFIG_DEFAULT_DEVICE_TREE="sandbox" -CONFIG_SYS_MALLOC_F=y CONFIG_CROS_EC=y CONFIG_DM_CROS_EC=y CONFIG_CROS_EC_SANDBOX=yconfigs/smdkc100_defconfig +0
-1@@ -2,4 +2,3 @@ CONFIG_ARM=y CONFIG_TARGET_SMDKC100=y CONFIG_ARCH_S5PC1XX=y CONFIG_DEFAULT_DEVICE_TREE="s5pc1xx-smdkc100" -CONFIG_SYS_MALLOC_F=yconfigs/snapper9260_defconfig +0
-1@@ -5,4 +5,3 @@ CONFIG_TARGET_SNAPPER9260=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y -CONFIG_SYS_MALLOC_F=yconfigs/snapper9g20_defconfig +0
-1@@ -5,4 +5,3 @@ CONFIG_TARGET_SNAPPER9260=y CONFIG_DM=y CONFIG_DM_GPIO=y CONFIG_DM_SERIAL=y -CONFIG_SYS_MALLOC_F=yconfigs/stv0991_defconfig +0
-1@@ -1,7 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="stv0991" CONFIG_ARM=y CONFIG_TARGET_STV0991=y -CONFIG_SYS_MALLOC_F=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_DM=y CONFIG_DM_SERIAL=yinclude/configs/rcar-gen2-common.h +0
-2@@ -35,8 +35,6 @@#define CONFIG_SYS_THUMB_BUILD #define CONFIG_SYS_GENERIC_BOARD -#define CONFIG_SYS_MALLOC_F_LEN (1 << 10) -/* Support File sytems */ #define CONFIG_FAT_WRITE #define CONFIG_DOS_PARTITION
PATCH v3 5/7 malloc_f: enable SYS_MALLOC_F by default if DM is on
In reply to Masahiro YamadaQuoted 11 lines · Masahiro Yamada
This option has a bool type, not hex.
Fix it and enable it ifCONFIG_DMis on because Driver Model always requires malloc memory. Devices are scanned twice, before/after relocation.CONFIG_SYS_MALLOC_Fshould be enabled to use malloc memory before relocation. As it is board-independent, handle it globally.Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stephen Warren <[email protected]>Reviewed-by Simon Glass <[email protected]>Acked-by Robert Baldyga <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150328/14b54f7d/attachment.sig>
PATCH v3 6/7 ARM: bcm283x: merge BCM2835/BCM2836 directories into mach-bcm283x
In reply to Masahiro YamadaBCM2835 (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 <[email protected]>
Acked-by Stephen Warren <[email protected]>
---
Changes in v2: None
arch/arm/Kconfig | 15 +++-----
arch/arm/Makefile | 1 +
arch/arm/cpu/arm1176/Makefile | 2 --
arch/arm/cpu/arm1176/bcm2835/Kconfig | 12 -------
arch/arm/cpu/armv7/Makefile | 1 -
arch/arm/cpu/armv7/bcm2835/Makefile | 13 -------
arch/arm/mach-bcm283x/Kconfig | 40 ++++++++++++++++++++++
.../{cpu/arm1176/bcm2835 => mach-bcm283x}/Makefile | 2 +-
.../{cpu/arm1176/bcm2835 => mach-bcm283x}/init.c | 0
.../bcm2835 => mach-bcm283x}/lowlevel_init.S | 0
.../{cpu/arm1176/bcm2835 => mach-bcm283x}/mbox.c | 0
.../{cpu/arm1176/bcm2835 => mach-bcm283x}/reset.c | 0
.../{cpu/arm1176/bcm2835 => mach-bcm283x}/timer.c | 0
board/raspberrypi/rpi/Kconfig | 15 --------
board/raspberrypi/rpi_2/Kconfig | 15 --------
configs/rpi_2_defconfig | 1 +
configs/rpi_defconfig | 1 +
17 files changed, 48 insertions(+), 70 deletions(-)
delete mode 100644 arch/arm/cpu/arm1176/bcm2835/Kconfig
delete mode 100644 arch/arm/cpu/armv7/bcm2835/Makefile
create mode 100644 arch/arm/mach-bcm283x/Kconfig
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/Makefile (72%)
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/init.c (100%)
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/lowlevel_init.S (100%)
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/mbox.c (100%)
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/reset.c (100%)
rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/timer.c (100%)
delete mode 100644 board/raspberrypi/rpi/Kconfig
delete mode 100644 board/raspberrypi/rpi_2/Kconfigarch/arm/Kconfig +4 -11
@@ -286,13 +286,8 @@ config TARGET_MX35PDK bool "Support mx35pdk" select CPU_ARM1136 -config TARGET_RPI - bool "Support rpi" - select CPU_ARM1176 - -config TARGET_RPI_2 - bool "Support rpi_2" - select CPU_V7 +config ARCH_BCM283X + bool "Broadcom BCM283X family" config TARGET_INTEGRATORAP_CM946ES bool "Support integratorap_cm946es"
@@ -723,9 +718,9 @@ endchoice source "arch/arm/mach-at91/Kconfig" -source "arch/arm/mach-davinci/Kconfig" +source "arch/arm/mach-bcm283x/Kconfig" -source "arch/arm/cpu/arm1176/bcm2835/Kconfig" +source "arch/arm/mach-davinci/Kconfig" source "arch/arm/cpu/armv7/exynos/Kconfig"
@@ -834,8 +829,6 @@ source "board/palmtreo680/Kconfig" source "board/phytec/pcm051/Kconfig" source "board/ppcag/bg0900/Kconfig" source "board/pxa255_idp/Kconfig" -source "board/raspberrypi/rpi/Kconfig" -source "board/raspberrypi/rpi_2/Kconfig" source "board/samsung/smdk2410/Kconfig" source "board/sandisk/sansa_fuze_plus/Kconfig" source "board/scb9328/Kconfig"
arch/arm/Makefile +1 -0
@@ -5,6 +5,7 @@ # Machine directory name. This list is sorted alphanumerically # by CONFIG_* macro name. machine-$(CONFIG_ARCH_AT91) += at91 +machine-$(CONFIG_ARCH_BCM283X) += bcm283x machine-$(CONFIG_ARCH_DAVINCI) += davinci machine-$(CONFIG_ARCH_HIGHBANK) += highbank machine-$(CONFIG_ARCH_KEYSTONE) += keystone
arch/arm/cpu/arm1176/Makefile +0 -2
@@ -10,5 +10,3 @@ extra-y = start.o obj-y = cpu.o - -obj-$(CONFIG_BCM2835) += bcm2835/
arch/arm/cpu/arm1176/bcm2835/Kconfig deleted +0 -12
@@ -1,12 +0,0 @@ -if TARGET_RPI || TARGET_RPI_2 - -config DM - default y - -config DM_SERIAL - default y - -config DM_GPIO - default y - -endif
arch/arm/cpu/armv7/Makefile +0 -1
@@ -39,7 +39,6 @@ endif obj-$(if $(filter am33xx,$(SOC)),y) += am33xx/ obj-$(if $(filter armada-xp,$(SOC)),y) += armada-xp/ -obj-$(CONFIG_BCM2835) += bcm2835/ obj-$(if $(filter bcm281xx,$(SOC)),y) += bcm281xx/ obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/ obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/
arch/arm/cpu/armv7/bcm2835/Makefile deleted +0 -13
@@ -1,13 +0,0 @@ -# -# (C) Copyright 2012 Stephen Warren -# -# SPDX-License-Identifier: GPL-2.0+ -# - -src_dir := ../../arm1176/bcm2835/ - -obj-y := -obj-y += $(src_dir)/init.o -obj-y += $(src_dir)/reset.o -obj-y += $(src_dir)/timer.o -obj-y += $(src_dir)/mbox.o
arch/arm/mach-bcm283x/Kconfig new file +40 -0
@@ -0,0 +1,40 @@ +menu "Broadcom BCM283X family" + depends on ARCH_BCM283X + +choice + prompt "Broadcom BCM283X board select" + +config TARGET_RPI + bool "Raspberry Pi" + select CPU_ARM1176 + +config TARGET_RPI_2 + bool "Raspberry Pi 2" + select CPU_V7 + +endchoice + +config DM + default y + +config DM_SERIAL + default y + +config DM_GPIO + default y + +config SYS_BOARD + default "rpi" if TARGET_RPI + default "rpi_2" if TARGET_RPI_2 + +config SYS_VENDOR + default "raspberrypi" + +config SYS_SOC + default "bcm2835" + +config SYS_CONFIG_NAME + default "rpi" if TARGET_RPI + default "rpi_2" if TARGET_RPI_2 + +endmenu
arch/arm/mach-bcm283x/Makefile renamed from arch/arm/cpu/arm1176/bcm2835/Makefile +1 -1
@@ -4,5 +4,5 @@ # SPDX-License-Identifier: GPL-2.0 # -obj-y := lowlevel_init.o +obj-$(CONFIG_TARGET_RPI) += lowlevel_init.o obj-y += init.o reset.o timer.o mbox.o
arch/arm/mach-bcm283x/init.c renamed from arch/arm/cpu/arm1176/bcm2835/init.c +0 -0
arch/arm/mach-bcm283x/lowlevel_init.S renamed from arch/arm/cpu/arm1176/bcm2835/lowlevel_init.S +0 -0
arch/arm/mach-bcm283x/mbox.c renamed from arch/arm/cpu/arm1176/bcm2835/mbox.c +0 -0
arch/arm/mach-bcm283x/reset.c renamed from arch/arm/cpu/arm1176/bcm2835/reset.c +0 -0
arch/arm/mach-bcm283x/timer.c renamed from arch/arm/cpu/arm1176/bcm2835/timer.c +0 -0
board/raspberrypi/rpi/Kconfig deleted +0 -15
@@ -1,15 +0,0 @@ -if TARGET_RPI - -config SYS_BOARD - default "rpi" - -config SYS_VENDOR - default "raspberrypi" - -config SYS_SOC - default "bcm2835" - -config SYS_CONFIG_NAME - default "rpi" - -endif
board/raspberrypi/rpi_2/Kconfig deleted +0 -15
@@ -1,15 +0,0 @@ -if TARGET_RPI_2 - -config SYS_BOARD - default "rpi_2" - -config SYS_VENDOR - default "raspberrypi" - -config SYS_SOC - default "bcm2835" - -config SYS_CONFIG_NAME - default "rpi_2" - -endif
configs/rpi_2_defconfig +1 -0
@@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI_2=y
configs/rpi_defconfig +1 -0
@@ -1,2 +1,3 @@ CONFIG_ARM=y +CONFIG_ARCH_BCM283X=y CONFIG_TARGET_RPI=y
Signature · 1 line
1.9.1
PATCH v3 6/7 ARM: bcm283x: merge BCM2835/BCM2836 directories into mach-bcm283x
Quoted 7 lines · Masahiro Yamada
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 <[email protected]>Acked-by Stephen Warren <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150328/87b205f0/attachment.sig>
PATCH v3 7/7 ARM: bcm283x: move SoC headers to mach-bcm283x/include/mach
In reply to Masahiro YamadaMove arch/arm/include/asm/arch-bcm283x/*
-> arch/arm/mach-bcm283x/include/mach/*
Signed-off-by Masahiro Yamada <[email protected]>
Acked-by Stephen Warren <[email protected]>
---
Changes in v2: None
arch/arm/mach-bcm283x/Kconfig | 2 +-
.../{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/gpio.h | 0
.../{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/mbox.h | 0
.../{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/sdhci.h | 0
.../{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/timer.h | 0
.../{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/wdog.h | 0
drivers/mmc/bcm2835_sdhci.c | 4 ++--
7 files changed, 3 insertions(+), 3 deletions(-)
rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/gpio.h (100%)
rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/mbox.h (100%)
rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/sdhci.h (100%)
rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/timer.h (100%)
rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/wdog.h (100%)arch/arm/mach-bcm283x/Kconfig +1 -1
@@ -31,7 +31,7 @@ config SYS_VENDOR default "raspberrypi" config SYS_SOC - default "bcm2835" + default "bcm283x" config SYS_CONFIG_NAME default "rpi" if TARGET_RPI
arch/arm/mach-bcm283x/include/mach/gpio.h renamed from arch/arm/include/asm/arch-bcm2835/gpio.h +0 -0
arch/arm/mach-bcm283x/include/mach/mbox.h renamed from arch/arm/include/asm/arch-bcm2835/mbox.h +0 -0
arch/arm/mach-bcm283x/include/mach/sdhci.h renamed from arch/arm/include/asm/arch-bcm2835/sdhci.h +0 -0
arch/arm/mach-bcm283x/include/mach/timer.h renamed from arch/arm/include/asm/arch-bcm2835/timer.h +0 -0
arch/arm/mach-bcm283x/include/mach/wdog.h renamed from arch/arm/include/asm/arch-bcm2835/wdog.h +0 -0
drivers/mmc/bcm2835_sdhci.c +2 -2
@@ -39,8 +39,8 @@#include <common.h> #include <malloc.h> #include <sdhci.h> -#include <asm/arch/timer.h> -#include <asm/arch-bcm2835/sdhci.h> +#include <mach/timer.h> +#include <mach/sdhci.h> /* 400KHz is max freq for card ID etc. Use that as min */ #define MIN_FREQ 400000
Signature · 1 line
1.9.1
PATCH v3 7/7 ARM: bcm283x: move SoC headers to mach-bcm283x/include/mach
Quoted 5 lines · Masahiro Yamada
Move
arch/arm/include/asm/arch-bcm283x/*
->arch/arm/mach-bcm283x/include/mach/*Signed-off-by Masahiro Yamada <[email protected]>Acked-by Stephen Warren <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150328/aadf0775/attachment.sig>