November 2015 - U-Boot

[U-Boot] [PATCH] Revert "arm: Switch 32-bit ARM to using generic global_data setup"
by Fabio Estevam 11 Nov '15

11 Nov '15

This reverts commit 5ba534d247d418e09c5b4fe5fb7fa780aac08e49. This commit causes cgtqmx6eval to not boot anymore: U-Boot SPL 2015.10-00527-g8800bee (Nov 09 2015 - 21:23:54) mxc_spi: SPI Slave not allocated ! Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- arch/arm/lib/crt0.S | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index 80548eb..4c3a94a 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -82,11 +82,31 @@ ENTRY(_main) #else bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ #endif - mov r0, sp - bl board_init_f_mem - mov sp, r0 - + mov r2, sp + sub sp, sp, #GD_SIZE /* allocate one GD above SP */ +#if defined(CONFIG_CPU_V7M) /* v7M forbids using SP as BIC destination */ + mov r3, sp + bic r3, r3, #7 + mov sp, r3 +#else + bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ +#endif + mov r9, sp /* GD is above SP */ + mov r1, sp mov r0, #0 +clr_gd: + cmp r1, r2 /* while not at end of GD */ +#if defined(CONFIG_CPU_V7M) + itt lo +#endif + strlo r0, [r1] /* clear 32-bit GD word */ + addlo r1, r1, #4 /* move to next */ + blo clr_gd +#if defined(CONFIG_SYS_MALLOC_F_LEN) + sub sp, sp, #CONFIG_SYS_MALLOC_F_LEN + str sp, [r9, #GD_MALLOC_BASE] +#endif + /* mov r0, #0 not needed due to above code */ bl board_init_f #if ! defined(CONFIG_SPL_BUILD) -- 1.9.1

4 12

[U-Boot] pull request: u-boot-uniphier/master
by Masahiro Yamada 11 Nov '15

11 Nov '15

Hi Tom, Here is my small pull request for v2016.01-rc1. The following changes since commit cad04990715f7eaecd45196e84cf10e9e3248dae: Merge branch 'master' of git://git.denx.de/u-boot-arm (2015-11-10 13:38:08 -0500) are available in the git repository at: git://git.denx.de/u-boot-uniphier.git master for you to fetch changes up to b375219e732f044e7f48b676fa4e36e7c29d81e1: ARM: uniphier: drop UniPhier specific SMP code (2015-11-11 23:35:35 +0900) ---------------------------------------------------------------- Masahiro Yamada (3): ARM: dts: uniphier: fix interrupt number of USB core for PH1-Pro4 ARM: dts: uniphier: add USB xHCI nodes for PH1-Pro5 and ProXstream2 ARM: uniphier: drop UniPhier specific SMP code arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 8 ++++++++ arch/arm/dts/uniphier-ph1-pro4.dtsi | 2 +- arch/arm/dts/uniphier-ph1-pro5-4kbox.dts | 4 ++++ arch/arm/dts/uniphier-ph1-pro5.dtsi | 18 ++++++++++++++++++ arch/arm/dts/uniphier-proxstream2-gentil.dts | 8 ++++++++ arch/arm/dts/uniphier-proxstream2-vodka.dts | 4 ++++ arch/arm/dts/uniphier-proxstream2.dtsi | 18 ++++++++++++++++++ arch/arm/mach-uniphier/Kconfig | 8 -------- arch/arm/mach-uniphier/lowlevel_init.S | 53 ----------------------------------------------------- 9 files changed, 61 insertions(+), 62 deletions(-) -- Best Regards Masahiro Yamada

2 1

[U-Boot] [PATCH] ARM: uniphier: drop UniPhier specific SMP code
by Masahiro Yamada 11 Nov '15

11 Nov '15

The latest Linux can directly handle SMP operations for UniPhier SoCs without any help of U-boot. Drop the relevant code from U-boot. See commit b1e4006aeda8c8784029de17d47987c21ea75f6d ("ARM: uniphier: rework SMP operations to use trampoline code") in Linux Kernel. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/mach-uniphier/Kconfig | 8 ----- arch/arm/mach-uniphier/lowlevel_init.S | 53 ---------------------------------- 2 files changed, 61 deletions(-) diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index 22ab798..9e6ac3a 100644 --- a/arch/arm/mach-uniphier/Kconfig +++ b/arch/arm/mach-uniphier/Kconfig @@ -3,12 +3,8 @@ if ARCH_UNIPHIER config SYS_CONFIG_NAME default "uniphier" -config UNIPHIER_SMP - bool - config ARCH_UNIPHIER_PH1_SLD3 bool "UniPhier PH1-sLD3 SoC" - select UNIPHIER_SMP help This enables support for UniPhier PH1-sLD3 SoC. @@ -20,7 +16,6 @@ config ARCH_UNIPHIER_PH1_LD4 config ARCH_UNIPHIER_PH1_PRO4 bool "UniPhier PH1-Pro4 SoC" - select UNIPHIER_SMP depends on !ARCH_UNIPHIER_PH1_SLD3 && \ !ARCH_UNIPHIER_PH1_LD4 && \ !ARCH_UNIPHIER_PH1_SLD8 @@ -35,7 +30,6 @@ config ARCH_UNIPHIER_PH1_SLD8 config ARCH_UNIPHIER_PH1_PRO5 bool "UniPhier PH1-Pro5 SoC" - select UNIPHIER_SMP depends on !ARCH_UNIPHIER_PH1_SLD3 && \ !ARCH_UNIPHIER_PH1_LD4 && \ !ARCH_UNIPHIER_PH1_SLD8 @@ -44,7 +38,6 @@ config ARCH_UNIPHIER_PH1_PRO5 config ARCH_UNIPHIER_PROXSTREAM2 bool "UniPhier ProXstream2 SoC" - select UNIPHIER_SMP depends on !ARCH_UNIPHIER_PH1_SLD3 && \ !ARCH_UNIPHIER_PH1_LD4 && \ !ARCH_UNIPHIER_PH1_SLD8 @@ -53,7 +46,6 @@ config ARCH_UNIPHIER_PROXSTREAM2 config ARCH_UNIPHIER_PH1_LD6B bool "UniPhier PH1-LD6b SoC" - select UNIPHIER_SMP depends on !ARCH_UNIPHIER_PH1_SLD3 && \ !ARCH_UNIPHIER_PH1_LD4 && \ !ARCH_UNIPHIER_PH1_SLD8 diff --git a/arch/arm/mach-uniphier/lowlevel_init.S b/arch/arm/mach-uniphier/lowlevel_init.S index 66cad42..5936045 100644 --- a/arch/arm/mach-uniphier/lowlevel_init.S +++ b/arch/arm/mach-uniphier/lowlevel_init.S @@ -44,59 +44,6 @@ ENTRY(lowlevel_init) bl enable_mmu -#ifdef CONFIG_UNIPHIER_SMP -secondary_startup: - /* - * Entry point for secondary CPUs - * - * The Boot ROM has already enabled MMU for the secondary CPUs as well - * as for the primary one. The MMU table embedded in the Boot ROM - * prohibits the DRAM access, so it is impossible to bring the - * secondary CPUs into DRAM directly. They must jump here into SPL, - * which is run on L2 cache. - * - * Boot Sequence - * [primary CPU] [secondary CPUs] - * start from Boot ROM start from Boot ROM - * jump to SPL sleep in Boot ROM - * kick secondaries ---(sev)---> jump to SPL - * jump to U-Boot main sleep in SPL - * jump to Linux - * kick secondaries ---(sev)---> jump to Linux - */ - - /* branch by CPU ID */ - mrc p15, 0, r0, c0, c0, 5 @ MPIDR (Multiprocessor Affinity Register) - and r0, r0, #0x3 - cmp r0, #0x0 - beq primary_cpu - /* only for secondary CPUs */ - ldr r1, =ROM_BOOT_ROMRSV2 @ The last data access to L2 cache - mrc p15, 0, r0, c1, c0, 0 @ SCTLR (System Control Register) - orr r0, r0, #CR_I @ Enable ICache - bic r0, r0, #(CR_C | CR_M) @ MMU and Dcache must be disabled - mcr p15, 0, r0, c1, c0, 0 @ before jumping to Linux - mov r0, #0 - str r0, [r1] - b 1f - /* - * L2 cache is shared among all the CPUs and it might be disabled by - * the primary one. Before that, the following 5 lines must be cached - * on the Icaches of the secondary CPUs. - */ -0: wfe @ kicked by Linux -1: ldr r0, [r1] - cmp r0, #0 - bxne r0 @ r0: Linux entry for secondary CPUs - b 0b -primary_cpu: - ldr r1, =ROM_BOOT_ROMRSV2 - ldr r0, =secondary_startup - str r0, [r1] - ldr r0, [r1] @ make sure str is complete before sev - sev @ kick the secondary CPU -#endif - bl setup_init_ram @ RAM area for temporary stack pointer mov lr, r8 @ restore link -- 1.9.1

2 4

[U-Boot] [PATCH 1/2] ARM: dts: uniphier: fix interrupt number of USB core for PH1-Pro4
by Masahiro Yamada 11 Nov '15

11 Nov '15

The IRQ is not used in U-boot, but this would be useful to sync device trees between Linux and U-boot. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/dts/uniphier-ph1-pro4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/dts/uniphier-ph1-pro4.dtsi b/arch/arm/dts/uniphier-ph1-pro4.dtsi index a57f8ae..a11b628 100644 --- a/arch/arm/dts/uniphier-ph1-pro4.dtsi +++ b/arch/arm/dts/uniphier-ph1-pro4.dtsi @@ -221,7 +221,7 @@ reg = <0x65c00000 0x100>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1>; - interrupts = <0 135 4>; + interrupts = <0 137 4>; }; pinctrl: pinctrl@5f801000 { -- 1.9.1

3 6

[U-Boot] [PATCH v2 1/8] x86: qemu: Remove call to vgabios execution
by Bin Meng 11 Nov '15

11 Nov '15

The call to pci_run_vga_bios() is not needed as this is handled in the vesa_fb driver. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- Changes in v2: None arch/x86/cpu/qemu/pci.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/arch/x86/cpu/qemu/pci.c b/arch/x86/cpu/qemu/pci.c index 2e94456..8515d10 100644 --- a/arch/x86/cpu/qemu/pci.c +++ b/arch/x86/cpu/qemu/pci.c @@ -6,7 +6,6 @@ #include <common.h> #include <pci.h> -#include <pci_rom.h> #include <asm/pci.h> #include <asm/arch/device.h> #include <asm/arch/qemu.h> @@ -51,11 +50,8 @@ void board_pci_setup_hose(struct pci_controller *hose) int board_pci_post_scan(struct pci_controller *hose) { - int ret = 0; u16 device, xbcs; int pam, i; - pci_dev_t vga; - ulong start; /* * i440FX and Q35 chipset have different PAM register offset, but with @@ -96,20 +92,7 @@ int board_pci_post_scan(struct pci_controller *hose) CONFIG_PCIE_ECAM_BASE | BAR_EN); } - /* - * QEMU emulated graphic card shows in the PCI configuration space with - * PCI vendor id and device id as an artificial pair 0x1234:0x1111. - * It is on PCI bus 0, function 0, but device number is not consistent - * for the two x86 targets it supports. For i440FX and PIIX chipset - * board, it shows as device 2, while for Q35 and ICH9 chipset board, - * it shows as device 1. - */ - vga = i440fx ? I440FX_VGA : Q35_VGA; - start = get_timer(0); - ret = pci_run_vga_bios(vga, NULL, PCI_ROM_USE_NATIVE); - debug("BIOS ran in %lums\n", get_timer(start)); - - return ret; + return 0; } #ifdef CONFIG_GENERATE_MP_TABLE -- 1.8.2.1

2 23

[U-Boot] [RFC PATCH v1 0/2] Make most DDR non-secure in MMU while keep a small block secure
by York Sun 11 Nov '15

11 Nov '15

This set is to change MMU tables so DDR is in non-secure mode that non-secure master such as SDHC DMA can access the data. To mix secure and non-secure MMU entries, the MMU tables themselves have to be in secure memory. A small portion memory is reserved at the end of DDR (before debug server and MC) to host secure application and the MMU tables. Changes in v1: Initial patch. Depends on http://patchwork.ozlabs.org/patch/540248/ York Sun (2): armv8: fsl-layerscape: Reserve memory for PPA armv8: fsl-layerscape: Make DDR non secure in MMU tables README | 14 +- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 149 +++++++++++++++++++-- arch/arm/include/asm/arch-fsl-layerscape/config.h | 3 + arch/arm/include/asm/arch-fsl-layerscape/cpu.h | 12 +- arch/arm/include/asm/global_data.h | 3 + board/freescale/ls2085a/ddr.c | 10 ++ board/freescale/ls2085a/ls2085a.c | 17 --- board/freescale/ls2085aqds/ddr.c | 10 ++ board/freescale/ls2085aqds/ls2085aqds.c | 17 --- board/freescale/ls2085ardb/ddr.c | 10 ++ board/freescale/ls2085ardb/ls2085ardb.c | 17 --- common/cmd_bdinfo.c | 4 + include/configs/ls2085a_common.h | 4 +- 13 files changed, 201 insertions(+), 69 deletions(-) -- 1.7.9.5

3 9

[U-Boot] [PATCH] Fix board init code to use a valid C runtime environment
by Albert ARIBAUD 11 Nov '15

11 Nov '15

board_init_f_mem() alters the C runtime environment's stack it ls actually already using. This is not a valid C runtime environment and may conflict with the C compiler's expectations. Split board_init_f_mem into C functions which do not alter their own stack and therefore function in a valid C runtime environment. NOTE: this has not been tested with all architectures. Signed-off-by: Albert ARIBAUD <albert.u.boot(a)aribaud.net> --- arch/arc/lib/start.S | 20 +++++++++++++--- arch/arm/lib/crt0.S | 10 ++++++-- arch/arm/lib/crt0_64.S | 12 +++++++--- arch/microblaze/cpu/start.S | 4 ++-- arch/nios2/cpu/start.S | 17 ++++++++++++-- arch/powerpc/cpu/ppc4xx/start.S | 18 ++++++++++---- arch/x86/cpu/start.S | 10 ++++++-- arch/x86/lib/fsp/fsp_common.c | 2 +- common/init/board_init.c | 33 +++++++++++++++----------- include/common.h | 52 +++++++++++++++++++++++++---------------- 10 files changed, 126 insertions(+), 52 deletions(-) diff --git a/arch/arc/lib/start.S b/arch/arc/lib/start.S index 26a5934..d24d60b 100644 --- a/arch/arc/lib/start.S +++ b/arch/arc/lib/start.S @@ -54,14 +54,28 @@ ENTRY(_start) mov %sp, CONFIG_SYS_INIT_SP_ADDR mov %fp, %sp - /* Allocate and zero GD, update SP */ + /* Allocate GD, update SP */ mov %r0, %sp - bl board_init_f_mem + bl board_init_f_gd_size + /* Update stack- and frame-pointers */ + sub %sp, %sp, %r0 + mov %fp, %sp + + /* Zero GD */ + mov %r0, %sp + bl board_init_f_gd + /* Allocate malloc, update SP */ + mov %r0, %sp + bl board_init_f_malloc_size /* Update stack- and frame-pointers */ - mov %sp, %r0 + sub %sp, %sp, %r0 mov %fp, %sp + /* update GD with malloc base */ + mov %r0, %sp + bl board_init_f_malloc + /* Zero the one and only argument of "board_init_f" */ mov_s %r0, 0 j board_init_f diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index 80548eb..26abab7 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -82,9 +82,15 @@ ENTRY(_main) #else bic sp, sp, #7 /* 8-byte alignment for ABI compliance */ #endif + bl board_init_f_gd_size + sub sp, r0 mov r0, sp - bl board_init_f_mem - mov sp, r0 + mov r9, r0 + bl board_init_f_gd + bl board_init_f_malloc_size + sub sp, r0 + mov r0, sp + bl board_init_f_malloc mov r0, #0 bl board_init_f diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index cef1c71..e716889 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -75,9 +75,15 @@ ENTRY(_main) ldr x0, =(CONFIG_SYS_INIT_SP_ADDR) #endif bic sp, x0, #0xf /* 16-byte alignment for ABI compliance */ - bl board_init_f_mem - mov sp, x0 - + bl board_init_f_gd_size + sub sp, x0 + mov x0, sp + bl board_init_f_gd + bl board_init_f_malloc_size + sub sp, x0 + mov x0, sp + bl board_init_f_malloc + mov x0, #0 bl board_init_f diff --git a/arch/microblaze/cpu/start.S b/arch/microblaze/cpu/start.S index 14f46a8..206be3e 100644 --- a/arch/microblaze/cpu/start.S +++ b/arch/microblaze/cpu/start.S @@ -25,7 +25,7 @@ _start: addi r8, r0, __end mts rslr, r8 - /* TODO: Redo this code to call board_init_f_mem() */ + /* TODO: Redo this code to call board_init_f_*() */ #if defined(CONFIG_SPL_BUILD) addi r1, r0, CONFIG_SPL_STACK_ADDR mts rshr, r1 @@ -142,7 +142,7 @@ _start: ori r12, r12, 0x1a0 mts rmsr, r12 - /* TODO: Redo this code to call board_init_f_mem() */ + /* TODO: Redo this code to call board_init_f_*() */ clear_bss: /* clear BSS segments */ addi r5, r0, __bss_start diff --git a/arch/nios2/cpu/start.S b/arch/nios2/cpu/start.S index 54787c5..4d5f0b0 100644 --- a/arch/nios2/cpu/start.S +++ b/arch/nios2/cpu/start.S @@ -107,9 +107,22 @@ _reloc: mov fp, sp /* Allocate and zero GD, update SP */ + movhi r2, %hi(board_init_f_gd_size@h) + ori r2, r2, %lo(board_init_gd_size@h) + callr r2 + sub sp, sp, r4 + mov r4, sp + movhi r2, %hi(board_init_f_gd@h) + ori r2, r2, %lo(board_init_f_gd@h) + callr r2 + /* Allocate malloc arena, update SP */ + movhi r2, %hi(board_init_f_malloc_size@h) + ori r2, r2, %lo(board_init_malloc_size@h) + callr r2 + sub sp, sp, r4 mov r4, sp - movhi r2, %hi(board_init_f_mem@h) - ori r2, r2, %lo(board_init_f_mem@h) + movhi r2, %hi(board_init_f_malloc@h) + ori r2, r2, %lo(board_init_f_malloc@h) callr r2 /* Update stack- and frame-pointers */ diff --git a/arch/powerpc/cpu/ppc4xx/start.S b/arch/powerpc/cpu/ppc4xx/start.S index 77d4040..c827c95 100644 --- a/arch/powerpc/cpu/ppc4xx/start.S +++ b/arch/powerpc/cpu/ppc4xx/start.S @@ -761,9 +761,14 @@ _start: bl cpu_init_f /* run low-level CPU init code (from Flash) */ #ifdef CONFIG_SYS_GENERIC_BOARD + bl board_init_f_gd_size + sub r1, r1, r3 mr r3, r1 - bl board_init_f_mem - mr r1, r3 + bl board_init_f_gd + bl board_init_f_malloc_size + sub r1, r1, r3 + mr r3, r1 + bl board_init_f_malloc li r0,0 stwu r0, -4(r1) stwu r0, -4(r1) @@ -1037,9 +1042,14 @@ _start: bl cpu_init_f /* run low-level CPU init code (from Flash) */ #ifdef CONFIG_SYS_GENERIC_BOARD + bl board_init_f_gd_size + sub r1, r1, r3 + mr r3, r1 + bl board_init_f_gd + bl board_init_f_malloc_size + sub r1, r1, r3 mr r3, r1 - bl board_init_f_mem - mr r1, r3 + bl board_init_f_malloc stwu r0, -4(r1) stwu r0, -4(r1) #endif diff --git a/arch/x86/cpu/start.S b/arch/x86/cpu/start.S index 5b4ee79..25ac286 100644 --- a/arch/x86/cpu/start.S +++ b/arch/x86/cpu/start.S @@ -122,9 +122,15 @@ car_init_ret: */ #endif /* Set up global data */ + call board_init_f_gd_size + subl %esp, %eax mov %esp, %eax - call board_init_f_mem - mov %eax, %esp + call board_init_f_gd + /* Set up malloc arena */ + call board_init_f_malloc_size + subl %esp, %eax + mov %esp, %eax + call board_init_f_malloc #ifdef CONFIG_DEBUG_UART call debug_uart_init diff --git a/arch/x86/lib/fsp/fsp_common.c b/arch/x86/lib/fsp/fsp_common.c index c78df94..cd7fd86 100644 --- a/arch/x86/lib/fsp/fsp_common.c +++ b/arch/x86/lib/fsp/fsp_common.c @@ -95,7 +95,7 @@ int x86_fsp_init(void) /* * The second time we enter here, adjust the size of malloc() * pool before relocation. Given gd->malloc_base was adjusted - * after the call to board_init_f_mem() in arch/x86/cpu/start.S, + * after the call to board_init_f_malloc() in arch/x86/cpu/start.S, * we should fix up gd->malloc_limit here. */ gd->malloc_limit += CONFIG_FSP_SYS_MALLOC_F_LEN; diff --git a/common/init/board_init.c b/common/init/board_init.c index e74b63b..1313138 100644 --- a/common/init/board_init.c +++ b/common/init/board_init.c @@ -29,32 +29,39 @@ __weak void arch_setup_gd(struct global_data *gd_ptr) } #endif /* !CONFIG_X86 */ -ulong board_init_f_mem(ulong top) +ulong board_init_f_gd_size(void) +{ + return roundup(sizeof(struct global_data), 16); +} + +void board_init_f_gd(struct global_data *gd_ptr) { - struct global_data *gd_ptr; #ifndef _USE_MEMCPY int *ptr; #endif - /* Leave space for the stack we are running with now */ - top -= 0x40; - - top -= sizeof(struct global_data); - top = ALIGN(top, 16); - gd_ptr = (struct global_data *)top; #ifdef _USE_MEMCPY memset(gd_ptr, '\0', sizeof(*gd)); #else for (ptr = (int *)gd_ptr; ptr < (int *)(gd_ptr + 1); ) *ptr++ = 0; #endif - arch_setup_gd(gd_ptr); +} +ulong board_init_f_malloc_size(void) +{ #if defined(CONFIG_SYS_MALLOC_F) && \ - (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START)) - top -= CONFIG_SYS_MALLOC_F_LEN; - gd->malloc_base = top; + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START)) + return CONFIG_SYS_MALLOC_F_LEN; +#else + return 0; #endif +} - return top; +void board_init_f_malloc(ulong malloc_base) +{ +#if defined(CONFIG_SYS_MALLOC_F) && \ + (!defined(CONFIG_SPL_BUILD) || !defined(CONFIG_SYS_SPL_MALLOC_START)) + gd->malloc_base = malloc_base; +#endif } diff --git a/include/common.h b/include/common.h index 09a131d..dbc2808 100644 --- a/include/common.h +++ b/include/common.h @@ -225,32 +225,44 @@ void board_init_f(ulong); void board_init_r(gd_t *, ulong) __attribute__ ((noreturn)); /** - * board_init_f_mem() - Allocate global data and set stack position + * board_init_f_gd_size() - Return the size of the global data * * This function is called by each architecture very early in the start-up - * code to set up the environment for board_init_f(). It allocates space for - * global_data (see include/asm-generic/global_data.h) and places the stack - * below this. + * code to allow the C runtime to reserve space for the GD on the stack. + * + * @return: GD size + */ +ulong board_init_f_gd_size(void); + +/** + * board_init_f_gd() - Initialize (zero) the global data * - * This function requires a stack[1] Normally this is at @top. The function - * starts allocating space from 64 bytes below @top. First it creates space - * for global_data. Then it calls arch_setup_gd() which sets gd to point to - * the global_data space and can reserve additional bytes of space if - * required). Finally it allocates early malloc() memory - * (CONFIG_SYS_MALLOC_F_LEN). The new top of the stack is just below this, - * and it returned by this function. + * This function is called once the C runtime has allocated the GD on + * the stack. It must initialize the GD. + * + * @gd_ptr: the pointer to the GD to initialize + */ +void board_init_f_gd(struct global_data *gd_ptr); + +/** + * board_init_f_malloc_size() - Return the size of the malloc arena * - * [1] Strictly speaking it would be possible to implement this function - * in C on many archs such that it does not require a stack. However this - * does not seem hugely important as only 64 byte are wasted. The 64 bytes - * are used to handle the calling standard which generally requires pushing - * addresses or registers onto the stack. We should be able to get away with - * less if this becomes important. + * This function is called once the GD is initialized, to allow the C + * runtime to allocate the malloc arena on the stack. + * + * @return: Malloc arena size + */ +ulong board_init_f_malloc_size(void); + +/** + * board_init_f_malloc() - Mark the malloc arena base in the global data * - * @top: Top of available memory, also normally the top of the stack - * @return: New stack location + * This function is called once the malloc arena is allocated on the + * stack. It marks the malloc arena base in the global data. + * + * @malloc_base: the base of the malloc arena */ -ulong board_init_f_mem(ulong top); +ulong board_init_f_malloc(ulong malloc_base); /** * arch_setup_gd() - Set up the global_data pointer -- 2.5.0

4 6

[U-Boot] [PATCH] Various Makefiles: Add SPDX-License-Identifier tags
by Tom Rini 10 Nov '15

10 Nov '15

After consulting with some of the SPDX team, the conclusion is that Makefiles are worth adding SPDX-License-Identifier tags too, and most of ours have one. This adds tags to ones that lack them and converts a few that had full (or in one case, very partial) license blobs into the equivalent tag. Cc: Kate Stewart <kstewart(a)linuxfoundation.org> Signed-off-by: Tom Rini <trini(a)konsulko.com> --- Makefile | 4 ++++ arch/arc/dts/Makefile | 4 ++++ arch/arm/cpu/Makefile | 4 ++++ arch/arm/dts/Makefile | 4 ++++ arch/arm/mach-at91/Makefile | 4 ++++ arch/arm/mach-tegra/tegra114/Makefile | 12 +----------- arch/arm/mach-tegra/tegra30/Makefile | 12 +----------- arch/arm/mach-uniphier/bcu/Makefile | 4 ++++ arch/arm/mach-uniphier/boot-mode/Makefile | 4 ++++ arch/arm/mach-uniphier/clk/Makefile | 4 ++++ arch/arm/mach-uniphier/ddrphy/Makefile | 4 ++++ arch/arm/mach-uniphier/early-clk/Makefile | 4 ++++ arch/arm/mach-uniphier/early-pinctrl/Makefile | 4 ++++ arch/arm/mach-uniphier/init/Makefile | 4 ++++ arch/arm/mach-uniphier/memconf/Makefile | 4 ++++ arch/arm/mach-uniphier/pinctrl/Makefile | 4 ++++ arch/arm/mach-uniphier/pll/Makefile | 4 ++++ arch/arm/mach-uniphier/sbc/Makefile | 4 ++++ arch/arm/mach-uniphier/umc/Makefile | 4 ++++ arch/blackfin/cpu/Makefile | 2 +- arch/microblaze/dts/Makefile | 4 ++++ arch/nios2/dts/Makefile | 4 ++++ arch/powerpc/cpu/Makefile | 4 ++++ arch/powerpc/cpu/mpc8xxx/Makefile | 4 +--- arch/powerpc/dts/Makefile | 4 ++++ arch/sandbox/dts/Makefile | 4 ++++ arch/x86/dts/Makefile | 4 ++++ board/atmark-techno/armadillo-800eva/Makefile | 14 +------------- board/birdland/bav335x/Makefile | 2 ++ board/compal/paz00/Makefile | 9 +-------- board/gdsys/p1022/Makefile | 5 +---- board/intercontrol/digsy_mtc/Makefile | 2 ++ board/nvidia/beaver/Makefile | 12 +----------- board/nvidia/dalmore/Makefile | 12 +----------- board/seco/common/Makefile | 3 +++ board/varisys/cyrus/Makefile | 2 ++ doc/DocBook/Makefile | 3 +++ drivers/Makefile | 4 ++++ drivers/bios_emulator/Makefile | 4 ++++ drivers/ddr/fsl/Makefile | 4 +--- drivers/memory/Makefile | 2 ++ drivers/pinctrl/Makefile | 4 ++++ drivers/pinctrl/uniphier/Makefile | 4 ++++ drivers/soc/Makefile | 2 ++ drivers/soc/keystone/Makefile | 4 ++++ drivers/usb/dwc3/Makefile | 4 ++++ drivers/usb/gadget/udc/Makefile | 3 +++ drivers/usb/musb-new/Makefile | 2 ++ examples/Makefile | 4 ++++ fs/yaffs2/Makefile | 7 +------ lib/bzip2/Makefile | 4 ++++ scripts/Makefile | 3 +++ scripts/basic/Makefile | 3 +++ scripts/kconfig/Makefile | 3 +++ tools/easylogo/Makefile | 4 ++++ 55 files changed, 169 insertions(+), 82 deletions(-) diff --git a/Makefile b/Makefile index 3c21f8d..b017593 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + VERSION = 2015 PATCHLEVEL = 10 SUBLEVEL = diff --git a/arch/arc/dts/Makefile b/arch/arc/dts/Makefile index 5bc6f44..d481fcd 100644 --- a/arch/arc/dts/Makefile +++ b/arch/arc/dts/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + dtb-$(CONFIG_TARGET_ARCANGEL4) += arcangel4.dtb dtb-$(CONFIG_TARGET_TB100) += abilis_tb100.dtb diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile index 6bea3d3..950e680 100644 --- a/arch/arm/cpu/Makefile +++ b/arch/arm/cpu/Makefile @@ -1 +1,5 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj- += dummy.o diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 910648c..9542fff 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + dtb-$(CONFIG_S5PC100) += s5pc1xx-smdkc100.dtb dtb-$(CONFIG_S5PC110) += s5pc1xx-goni.dtb dtb-$(CONFIG_EXYNOS4) += exynos4210-origen.dtb \ diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 313eb47..30f2b49 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_AT91_WANTS_COMMON_PHY) += phy.o ifneq ($(CONFIG_SPL_BUILD),) obj-$(CONFIG_AT91SAM9260) += sdram.o spl_at91.o diff --git a/arch/arm/mach-tegra/tegra114/Makefile b/arch/arm/mach-tegra/tegra114/Makefile index 7489f5f..ea7f7b7 100644 --- a/arch/arm/mach-tegra/tegra114/Makefile +++ b/arch/arm/mach-tegra/tegra114/Makefile @@ -1,17 +1,7 @@ # # Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. # -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-2.0 # obj-$(CONFIG_SPL_BUILD) += cpu.o diff --git a/arch/arm/mach-tegra/tegra30/Makefile b/arch/arm/mach-tegra/tegra30/Makefile index bc250de..d3d3b6e 100644 --- a/arch/arm/mach-tegra/tegra30/Makefile +++ b/arch/arm/mach-tegra/tegra30/Makefile @@ -1,17 +1,7 @@ # # Copyright (c) 2010-2012, NVIDIA CORPORATION. All rights reserved. # -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-2.0 # obj-$(CONFIG_SPL_BUILD) += cpu.o diff --git a/arch/arm/mach-uniphier/bcu/Makefile b/arch/arm/mach-uniphier/bcu/Makefile index 5b95bda..b8b0323 100644 --- a/arch/arm/mach-uniphier/bcu/Makefile +++ b/arch/arm/mach-uniphier/bcu/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += bcu-ph1-sld3.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += bcu-ph1-ld4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8) += bcu-ph1-ld4.o diff --git a/arch/arm/mach-uniphier/boot-mode/Makefile b/arch/arm/mach-uniphier/boot-mode/Makefile index 30c8874..0797d6e 100644 --- a/arch/arm/mach-uniphier/boot-mode/Makefile +++ b/arch/arm/mach-uniphier/boot-mode/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-y += boot-mode.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += boot-mode-ph1-sld3.o diff --git a/arch/arm/mach-uniphier/clk/Makefile b/arch/arm/mach-uniphier/clk/Makefile index 4f397b9..bc0f27c 100644 --- a/arch/arm/mach-uniphier/clk/Makefile +++ b/arch/arm/mach-uniphier/clk/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += clk-ph1-ld4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += clk-ph1-ld4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += clk-ph1-pro4.o diff --git a/arch/arm/mach-uniphier/ddrphy/Makefile b/arch/arm/mach-uniphier/ddrphy/Makefile index e2d109d..d0f4bd3 100644 --- a/arch/arm/mach-uniphier/ddrphy/Makefile +++ b/arch/arm/mach-uniphier/ddrphy/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += ddrphy-training.o ddrphy-ph1-ld4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += ddrphy-training.o ddrphy-ph1-pro4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8) += ddrphy-training.o ddrphy-ph1-sld8.o diff --git a/arch/arm/mach-uniphier/early-clk/Makefile b/arch/arm/mach-uniphier/early-clk/Makefile index 393ea96..3e1e1b2 100644 --- a/arch/arm/mach-uniphier/early-clk/Makefile +++ b/arch/arm/mach-uniphier/early-clk/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += early-clk-ph1-ld4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += early-clk-ph1-ld4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += early-clk-ph1-ld4.o diff --git a/arch/arm/mach-uniphier/early-pinctrl/Makefile b/arch/arm/mach-uniphier/early-pinctrl/Makefile index e497d28..3be71fb 100644 --- a/arch/arm/mach-uniphier/early-pinctrl/Makefile +++ b/arch/arm/mach-uniphier/early-pinctrl/Makefile @@ -1 +1,5 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += early-pinctrl-ph1-sld3.o diff --git a/arch/arm/mach-uniphier/init/Makefile b/arch/arm/mach-uniphier/init/Makefile index 98833b5..ef80953 100644 --- a/arch/arm/mach-uniphier/init/Makefile +++ b/arch/arm/mach-uniphier/init/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-y += init.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += init-ph1-sld3.o diff --git a/arch/arm/mach-uniphier/memconf/Makefile b/arch/arm/mach-uniphier/memconf/Makefile index 42057a2..a152f61 100644 --- a/arch/arm/mach-uniphier/memconf/Makefile +++ b/arch/arm/mach-uniphier/memconf/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-y += memconf.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += memconf-ph1-sld3.o obj-$(CONFIG_ARCH_UNIPHIER_PROXSTREAM2) += memconf-proxstream2.o diff --git a/arch/arm/mach-uniphier/pinctrl/Makefile b/arch/arm/mach-uniphier/pinctrl/Makefile index 8517595..80a9cda 100644 --- a/arch/arm/mach-uniphier/pinctrl/Makefile +++ b/arch/arm/mach-uniphier/pinctrl/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += pinctrl-ph1-sld3.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += pinctrl-ph1-ld4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += pinctrl-ph1-pro4.o diff --git a/arch/arm/mach-uniphier/pll/Makefile b/arch/arm/mach-uniphier/pll/Makefile index d33f99e..ca88521 100644 --- a/arch/arm/mach-uniphier/pll/Makefile +++ b/arch/arm/mach-uniphier/pll/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += pll-init-ph1-sld3.o \ pll-spectrum-ph1-sld3.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += pll-init-ph1-ld4.o \ diff --git a/arch/arm/mach-uniphier/sbc/Makefile b/arch/arm/mach-uniphier/sbc/Makefile index db622d2..57eb44b 100644 --- a/arch/arm/mach-uniphier/sbc/Makefile +++ b/arch/arm/mach-uniphier/sbc/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD3) += sbc-ph1-sld3.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += sbc-ph1-ld4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += sbc-ph1-pro4.o diff --git a/arch/arm/mach-uniphier/umc/Makefile b/arch/arm/mach-uniphier/umc/Makefile index dd35e77..89b2dec 100644 --- a/arch/arm/mach-uniphier/umc/Makefile +++ b/arch/arm/mach-uniphier/umc/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_ARCH_UNIPHIER_PH1_LD4) += umc-ph1-ld4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_PRO4) += umc-ph1-pro4.o obj-$(CONFIG_ARCH_UNIPHIER_PH1_SLD8) += umc-ph1-sld8.o diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile index cfbcd31..7cd0bbf 100644 --- a/arch/blackfin/cpu/Makefile +++ b/arch/blackfin/cpu/Makefile @@ -6,7 +6,7 @@ # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. # -# Licensed under the GPL-2 or later. +# SPDX-License-Identifier: GPL-2.0+ # extra-y := init.elf diff --git a/arch/microblaze/dts/Makefile b/arch/microblaze/dts/Makefile index 6d4a11f..5e70d9e 100644 --- a/arch/microblaze/dts/Makefile +++ b/arch/microblaze/dts/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + dtb-y += microblaze-generic.dtb targets += $(dtb-y) diff --git a/arch/nios2/dts/Makefile b/arch/nios2/dts/Makefile index b40eca9..f22fabf 100644 --- a/arch/nios2/dts/Makefile +++ b/arch/nios2/dts/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + dtb-y += $(CONFIG_DEFAULT_DEVICE_TREE:"%"=%).dtb targets += $(dtb-y) diff --git a/arch/powerpc/cpu/Makefile b/arch/powerpc/cpu/Makefile index 88b5298..b182aa6 100644 --- a/arch/powerpc/cpu/Makefile +++ b/arch/powerpc/cpu/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_MPC83xx) += mpc8xxx/ obj-$(CONFIG_MPC85xx) += mpc8xxx/ obj-$(CONFIG_MPC86xx) += mpc8xxx/ diff --git a/arch/powerpc/cpu/mpc8xxx/Makefile b/arch/powerpc/cpu/mpc8xxx/Makefile index e95539e..ac45e0e 100644 --- a/arch/powerpc/cpu/mpc8xxx/Makefile +++ b/arch/powerpc/cpu/mpc8xxx/Makefile @@ -1,9 +1,7 @@ # # Copyright 2009-2010 Freescale Semiconductor, Inc. # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# Version 2 as published by the Free Software Foundation. +# SPDX-License-Identifier: GPL-2.0 # MINIMAL= diff --git a/arch/powerpc/dts/Makefile b/arch/powerpc/dts/Makefile index ad104b9..5d9f5c2 100644 --- a/arch/powerpc/dts/Makefile +++ b/arch/powerpc/dts/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + dtb-$(CONFIG_TARGET_CANYONLANDS) += arches.dtb canyonlands.dtb glacier.dtb targets += $(dtb-y) diff --git a/arch/sandbox/dts/Makefile b/arch/sandbox/dts/Makefile index 517b555..0197569 100644 --- a/arch/sandbox/dts/Makefile +++ b/arch/sandbox/dts/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + dtb-$(CONFIG_SANDBOX) += sandbox.dtb dtb-$(CONFIG_UT_DM) += test.dtb diff --git a/arch/x86/dts/Makefile b/arch/x86/dts/Makefile index 83a2b8c..64e5694 100644 --- a/arch/x86/dts/Makefile +++ b/arch/x86/dts/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + dtb-y += bayleybay.dtb \ chromebook_link.dtb \ chromebox_panther.dtb \ diff --git a/board/atmark-techno/armadillo-800eva/Makefile b/board/atmark-techno/armadillo-800eva/Makefile index 2743809..97342a8 100644 --- a/board/atmark-techno/armadillo-800eva/Makefile +++ b/board/atmark-techno/armadillo-800eva/Makefile @@ -1,20 +1,8 @@ # # Copyright (C) 2012 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License. +# SPDX-License-Identifier: GPL-2.0 # -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA obj-y += armadillo-800eva.o diff --git a/board/birdland/bav335x/Makefile b/board/birdland/bav335x/Makefile index 2fc5614..d2aba7b 100644 --- a/board/birdland/bav335x/Makefile +++ b/board/birdland/bav335x/Makefile @@ -3,6 +3,8 @@ # # Copyright (C) 2012-2014, Birdland Audio - http://birdland.com/oem # +# SPDX-License-Identifier: GPL-2.0+ +# ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),) obj-y := mux.o diff --git a/board/compal/paz00/Makefile b/board/compal/paz00/Makefile index b5fde8d..aa56643 100644 --- a/board/compal/paz00/Makefile +++ b/board/compal/paz00/Makefile @@ -4,14 +4,7 @@ # See file CREDITS for list of people who contributed to this # project. # -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. +# SPDX-License-Identifier: GPL-2.0 # obj-y := paz00.o diff --git a/board/gdsys/p1022/Makefile b/board/gdsys/p1022/Makefile index 6e02447..482a9aa 100644 --- a/board/gdsys/p1022/Makefile +++ b/board/gdsys/p1022/Makefile @@ -1,10 +1,7 @@ # # Copyright 2010 Freescale Semiconductor, Inc. # -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by the Free -# Software Foundation; either version 2 of the License, or (at your option) -# any later version. +# SPDX-License-Identifier: GPL-2.0+ # obj-y += law.o diff --git a/board/intercontrol/digsy_mtc/Makefile b/board/intercontrol/digsy_mtc/Makefile index 44b7c0a..fd0c2f9 100644 --- a/board/intercontrol/digsy_mtc/Makefile +++ b/board/intercontrol/digsy_mtc/Makefile @@ -1,6 +1,8 @@ # # Author: Grzegorz Bernacki, Semihalf, gjb(a)semihalf.com # +# SPDX-License-Identifier: GPL-2.0+ +# obj-y := digsy_mtc.o cmd_mtc.o obj-$(CONFIG_VIDEO) += cmd_disp.o diff --git a/board/nvidia/beaver/Makefile b/board/nvidia/beaver/Makefile index 1f7c31d..ef5dd13 100644 --- a/board/nvidia/beaver/Makefile +++ b/board/nvidia/beaver/Makefile @@ -1,17 +1,7 @@ # # Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. # -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-2.0 # obj-y = ../cardhu/cardhu.o diff --git a/board/nvidia/dalmore/Makefile b/board/nvidia/dalmore/Makefile index 7cdff9c..c9d76e8 100644 --- a/board/nvidia/dalmore/Makefile +++ b/board/nvidia/dalmore/Makefile @@ -1,17 +1,7 @@ # # Copyright (c) 2010-2013, NVIDIA CORPORATION. All rights reserved. # -# This program is free software; you can redistribute it and/or modify it -# under the terms and conditions of the GNU General Public License, -# version 2, as published by the Free Software Foundation. -# -# This program is distributed in the hope it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# SPDX-License-Identifier: GPL-2.0 # obj-y := dalmore.o diff --git a/board/seco/common/Makefile b/board/seco/common/Makefile index 9e37ebb..293cf5f 100644 --- a/board/seco/common/Makefile +++ b/board/seco/common/Makefile @@ -1,2 +1,5 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# obj-$(CONFIG_TARGET_SECOMX6) += mx6.o diff --git a/board/varisys/cyrus/Makefile b/board/varisys/cyrus/Makefile index 303fc42..a7978a0 100644 --- a/board/varisys/cyrus/Makefile +++ b/board/varisys/cyrus/Makefile @@ -1,4 +1,6 @@ # +# SPDX-License-Identifier: GPL-2.0+ +# obj-y += $(BOARD).o obj-y += ddr.o diff --git a/doc/DocBook/Makefile b/doc/DocBook/Makefile index 593237f..1eab4a6 100644 --- a/doc/DocBook/Makefile +++ b/doc/DocBook/Makefile @@ -5,6 +5,9 @@ # to document the SRC - and how to read it. # To add a new book the only step required is to add the book to the # list of DOCBOOKS. +# +# SPDX-License-Identifier: GPL-2.0+ +# DOCBOOKS := linker_lists.xml stdio.xml diff --git a/drivers/Makefile b/drivers/Makefile index ad29a4f..c9031f2 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_$(SPL_)DM) += core/ obj-$(CONFIG_$(SPL_)CLK) += clk/ obj-$(CONFIG_$(SPL_)LED) += led/ diff --git a/drivers/bios_emulator/Makefile b/drivers/bios_emulator/Makefile index 2ba43ac..0a28074 100644 --- a/drivers/bios_emulator/Makefile +++ b/drivers/bios_emulator/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + X86DIR = x86emu obj-y = atibios.o biosemu.o besys.o bios.o \ diff --git a/drivers/ddr/fsl/Makefile b/drivers/ddr/fsl/Makefile index df66c07..01ea862 100644 --- a/drivers/ddr/fsl/Makefile +++ b/drivers/ddr/fsl/Makefile @@ -1,9 +1,7 @@ # # Copyright 2008-2014 Freescale Semiconductor, Inc. # -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# Version 2 as published by the Free Software Foundation. +# SPDX-License-Identifier: GPL-2.0 # obj-$(CONFIG_SYS_FSL_DDR1) += main.o util.o ctrl_regs.o options.o \ diff --git a/drivers/memory/Makefile b/drivers/memory/Makefile index 9bfb9c7..6124e38 100644 --- a/drivers/memory/Makefile +++ b/drivers/memory/Makefile @@ -1 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0+ + obj-$(CONFIG_TI_AEMIF) += ti-aemif.o diff --git a/drivers/pinctrl/Makefile b/drivers/pinctrl/Makefile index e56a17f..70d25dc 100644 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-y += pinctrl-uclass.o obj-$(CONFIG_$(SPL_)PINCTRL_GENERIC) += pinctrl-generic.o diff --git a/drivers/pinctrl/uniphier/Makefile b/drivers/pinctrl/uniphier/Makefile index e215b10..c5cdd84 100644 --- a/drivers/pinctrl/uniphier/Makefile +++ b/drivers/pinctrl/uniphier/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_PINCTRL_UNIPHIER_CORE) += pinctrl-uniphier-core.o obj-$(CONFIG_PINCTRL_UNIPHIER_PH1_LD4) += pinctrl-ph1-ld4.o diff --git a/drivers/soc/Makefile b/drivers/soc/Makefile index 3d4baa5..99345eb 100644 --- a/drivers/soc/Makefile +++ b/drivers/soc/Makefile @@ -1,5 +1,7 @@ # # Makefile for the U-boot SOC specific device drivers. # +# SPDX-License-Identifier: GPL-2.0+ +# obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ diff --git a/drivers/soc/keystone/Makefile b/drivers/soc/keystone/Makefile index c000eca..1334fa4 100644 --- a/drivers/soc/keystone/Makefile +++ b/drivers/soc/keystone/Makefile @@ -1 +1,5 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_TI_KEYSTONE_SERDES) += keystone_serdes.o diff --git a/drivers/usb/dwc3/Makefile b/drivers/usb/dwc3/Makefile index 02bb216..0cd7302 100644 --- a/drivers/usb/dwc3/Makefile +++ b/drivers/usb/dwc3/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_USB_DWC3) += dwc3.o dwc3-y := core.o diff --git a/drivers/usb/gadget/udc/Makefile b/drivers/usb/gadget/udc/Makefile index 12380f4..1699ccd 100644 --- a/drivers/usb/gadget/udc/Makefile +++ b/drivers/usb/gadget/udc/Makefile @@ -1,4 +1,7 @@ # # USB peripheral controller drivers # +# SPDX-License-Identifier: GPL-2.0+ +# + obj-$(CONFIG_USB_DWC3_GADGET) += udc-core.o diff --git a/drivers/usb/musb-new/Makefile b/drivers/usb/musb-new/Makefile index fd9df72..072d516 100644 --- a/drivers/usb/musb-new/Makefile +++ b/drivers/usb/musb-new/Makefile @@ -1,6 +1,8 @@ # # for USB OTG silicon based on Mentor Graphics INVENTRA designs # +# SPDX-License-Identifier: GPL-2.0+ +# obj-$(CONFIG_USB_MUSB_GADGET) += musb_gadget.o musb_gadget_ep0.o musb_core.o obj-$(CONFIG_USB_MUSB_GADGET) += musb_uboot.o diff --git a/examples/Makefile b/examples/Makefile index 18d008e..8e329d7 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + ifndef CONFIG_SANDBOX ifdef FTRACE diff --git a/fs/yaffs2/Makefile b/fs/yaffs2/Makefile index 45ff745..b69ea73 100644 --- a/fs/yaffs2/Makefile +++ b/fs/yaffs2/Makefile @@ -8,13 +8,8 @@ # # Created by Charles Manning <charles(a)aleph1.co.uk> # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License version 2 as -# published by the Free Software Foundation. +# SPDX-License-Identifier: GPL-2.0 # -# NB Warning this Makefile does not include header dependencies. -# -# $Id: Makefile,v 1.15 2007/07/18 19:40:38 charles Exp $ obj-y := \ yaffs_allocator.o yaffs_attribs.o yaffs_bitmap.o yaffs_uboot_glue.o\ diff --git a/lib/bzip2/Makefile b/lib/bzip2/Makefile index 929c24e..f0b81ad 100644 --- a/lib/bzip2/Makefile +++ b/lib/bzip2/Makefile @@ -1,2 +1,6 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + obj-y += bzlib.o bzlib_crctable.o bzlib_decompress.o \ bzlib_randtable.o bzlib_huffman.o diff --git a/scripts/Makefile b/scripts/Makefile index efe25bf..2f081f7 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -3,6 +3,9 @@ # the kernel for the build process. # --------------------------------------------------------------------------- # docproc: Used in Documentation/DocBook +# +# SPDX-License-Identifier: GPL-2.0 +# # The following hostprogs-y programs are only build on demand hostprogs-y += docproc diff --git a/scripts/basic/Makefile b/scripts/basic/Makefile index 4fcef87..f883857 100644 --- a/scripts/basic/Makefile +++ b/scripts/basic/Makefile @@ -7,6 +7,9 @@ # .config is included by main Makefile. # --------------------------------------------------------------------------- # fixdep: Used to generate dependency information during build process +# +# SPDX-License-Identifier: GPL-2.0 +# hostprogs-y := fixdep always := $(hostprogs-y) diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile index 46ddf2d..14285b1 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile @@ -1,6 +1,9 @@ # =========================================================================== # Kernel configuration targets # These targets are used from top-level makefile +# +# SPDX-License-Identifier: GPL-2.0 +# PHONY += xconfig gconfig menuconfig config silentoldconfig update-po-config \ localmodconfig localyesconfig diff --git a/tools/easylogo/Makefile b/tools/easylogo/Makefile index 10aba2b..3c3e69f 100644 --- a/tools/easylogo/Makefile +++ b/tools/easylogo/Makefile @@ -1,3 +1,7 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# + hostprogs-y := easylogo always := $(hostprogs-y) -- 1.7.9.5

1 2

[U-Boot] [PATCH] arm: novena: Switch novena to config_distro_bootcmd
by Marek Vasut 10 Nov '15

10 Nov '15

From: Vagrant Cascadian <vagrant(a)aikidev.net> Switch Novena to distro bootcmd, so it can be used with debian easily. Signed-off-by: Vagrant Cascadian <vagrant(a)aikidev.net> Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Sean Cross <xobs(a)kosagi.com> Cc: Stefano Babic <sbabic(a)denx.de> --- include/configs/novena.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/include/configs/novena.h b/include/configs/novena.h index 718989f..b0f4c02 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -16,6 +16,7 @@ #define CONFIG_FIT #define CONFIG_KEYBOARD +#include <config_distro_defaults.h> #include "mx6_common.h" /* U-Boot Commands */ @@ -58,7 +59,7 @@ /* Booting Linux */ #define CONFIG_BOOTFILE "fitImage" #define CONFIG_BOOTARGS "console=ttymxc1,115200 " -#define CONFIG_BOOTCOMMAND "run net_nfs" +#define CONFIG_BOOTCOMMAND "run distro_bootcmd ; run net_nfs" #define CONFIG_HOSTNAME novena /* Physical Memory Map */ @@ -190,6 +191,7 @@ #endif /* Extra U-Boot environment. */ +#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -199,6 +201,11 @@ "rootdev=/dev/mmcblk0p2\0" \ "netdev=eth0\0" \ "kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0" \ + "kernel_addr_r="__stringify(CONFIG_LOADADDR)"\0" \ + "pxefile_addr_r="__stringify(CONFIG_LOADADDR)"\0" \ + "scriptaddr="__stringify(CONFIG_LOADADDR)"\0" \ + "ramdisk_addr_r=0x28000000\0" \ + "fdt_addr_r=0x10000000\0" \ "addcons=" \ "setenv bootargs ${bootargs} " \ "console=${consdev},${baudrate}\0" \ @@ -242,5 +249,19 @@ "fatwrite mmc 0:1 ${loadaddr} u-boot.img ${filesize} ; "\ "fi ; " \ "fi\0" \ + BOOTENV + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(USB, usb, 0) \ + func(SATA, sata, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> + +#else +#define CONFIG_EXTRA_ENV_SETTINGS +#endif /* CONFIG_SPL_BUILD */ #endif /* __CONFIG_H */ -- 2.1.4

2 2

[U-Boot] [PATCH][v2] mpc85xx/u-boot*.lds: remove _GLOBAL_OFFSET_TABLE_ definition
by Prabhakar Kushwaha 10 Nov '15

10 Nov '15

From: Zhenhua Luo <zhenhua.luo(a)freescale.com> In binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbols defined by PROVIDE in u-boot.lds overrides the linker built-in symbols (https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff; h=b893397a4b1316610f49819344817715e4305de9), so the linker is treating _GLOBAL_OFFSET_TABLE_ as a definition into the .reloc section. To align with the change of binutils-2.25, the _GLOBAL_OFFSET_TABLE_ symbol should not be defined in sections, and the symbols in linker generated .got section should be used(https://sourceware.org/ml/binutils/2008-09/ msg00122.html) Fixed the following build errors with binutils-2.25: | powerpc-poky-linux-gnuspe-ld.bfd: _GLOBAL_OFFSET_TABLE_ not defined in linker created .got Signed-off-by: Zhenhua Luo <zhenhua.luo(a)freescale.com> Signed-off-by: Prabhakar Kushwaha <prabhakar(a)freescale.com> --- Changes for v2: Updated Subject arch/powerpc/cpu/mpc85xx/u-boot-nand.lds | 1 - arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds | 1 - arch/powerpc/cpu/mpc85xx/u-boot-spl.lds | 1 - arch/powerpc/cpu/mpc85xx/u-boot.lds | 1 - 4 files changed, 4 deletions(-) diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds index f933b21..0399f93 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand.lds @@ -44,7 +44,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds index b83c553..f044564 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-nand_spl.lds @@ -22,7 +22,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } diff --git a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds index 5ae7b3e..889a4c2 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot-spl.lds @@ -29,7 +29,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds index 2cf0b25..f15eaf3 100644 --- a/arch/powerpc/cpu/mpc85xx/u-boot.lds +++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds @@ -50,7 +50,6 @@ SECTIONS _GOT2_TABLE_ = .; KEEP(*(.got2)) KEEP(*(.got)) - PROVIDE(_GLOBAL_OFFSET_TABLE_ = . + 4); _FIXUP_TABLE_ = .; KEEP(*(.fixup)) } -- 1.9.1

5 4