November 2012 - U-Boot

[U-Boot] [PATCH] powerpc/corenet_ds: move SATA config to board configuration
by Roy Zang 01 Nov '12

01 Nov '12

board configuration file is included before asm/config_mpc85xx.h. however, CONFIG_FSL_SATA_V2 is defined in asm/config_mpc85xx.h. it will never take effective in the board configuration file for this kind of code : #ifdef CONFIG_FSL_SATA_V2 ... #endif To solve this problem, move CONFIG_FSL_SATA_V2 to board configuration header file. Signed-off-by: Roy Zang <tie-fei.zang(a)freescale.com> --- arch/powerpc/include/asm/config_mpc85xx.h | 3 --- include/configs/P2041RDB.h | 4 +++- include/configs/P3041DS.h | 1 + include/configs/P5020DS.h | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/include/asm/config_mpc85xx.h b/arch/powerpc/include/asm/config_mpc85xx.h index 03baaee..8916d5e 100644 --- a/arch/powerpc/include/asm/config_mpc85xx.h +++ b/arch/powerpc/include/asm/config_mpc85xx.h @@ -318,7 +318,6 @@ #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 #define CONFIG_SYS_FSL_NUM_LAWS 32 #define CONFIG_SYS_FSL_SEC_COMPAT 4 -#define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 @@ -350,7 +349,6 @@ #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 #define CONFIG_SYS_FSL_NUM_LAWS 32 #define CONFIG_SYS_FSL_SEC_COMPAT 4 -#define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 @@ -425,7 +423,6 @@ #define CONFIG_SYS_FSL_NUM_CC_PLLS 2 #define CONFIG_SYS_FSL_NUM_LAWS 32 #define CONFIG_SYS_FSL_SEC_COMPAT 4 -#define CONFIG_FSL_SATA_V2 #define CONFIG_SYS_NUM_FMAN 1 #define CONFIG_SYS_NUM_FM1_DTSEC 5 #define CONFIG_SYS_NUM_FM1_10GEC 1 diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index 5cdb628..8509d20 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -560,8 +560,10 @@ unsigned long get_board_sys_clk(unsigned long dummy); #endif /* CONFIG_PCI */ /* SATA */ +#define CONFIG_FSL_SATA_V2 + +#ifdef CONFIG_FSL_SATA_V2 #define CONFIG_FSL_SATA -#ifdef CONFIG_FSL_SATA #define CONFIG_LIBATA #define CONFIG_SYS_SATA_MAX_DEVICE 2 diff --git a/include/configs/P3041DS.h b/include/configs/P3041DS.h index cf184e7..ce8f9b0 100644 --- a/include/configs/P3041DS.h +++ b/include/configs/P3041DS.h @@ -32,6 +32,7 @@ #define CONFIG_MMC #define CONFIG_NAND_FSL_ELBC +#define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE3 #define CONFIG_PCIE4 #define CONFIG_SYS_DPAA_RMAN diff --git a/include/configs/P5020DS.h b/include/configs/P5020DS.h index 7018d7a..778230d 100644 --- a/include/configs/P5020DS.h +++ b/include/configs/P5020DS.h @@ -32,6 +32,7 @@ #define CONFIG_MMC #define CONFIG_NAND_FSL_ELBC +#define CONFIG_FSL_SATA_V2 #define CONFIG_PCIE3 #define CONFIG_PCIE4 #define CONFIG_SYS_FSL_RAID_ENGINE -- 1.7.8.1

2 1

[U-Boot] Linker errors from .u_boot_list in powerpc
by Joe Hershberger 01 Nov '12

01 Nov '12

Hi Marek, Not sure if you were already aware of this, but I ran across these errors with MAKEALL on PPC. alpr: powerpc-linux-gnu-ld: section .bootpg loaded at [00000000fffff000,00000000fffff27f] overlaps section .u_boot_list loaded at [00000000ffffee8c,00000000fffff3cb] powerpc-linux-gnu-ld: u-boot: section .bootpg lma 0xfffff000 adjusted to 0xfffff3cc P2020DS_36BIT: powerpc-linux-gnu-ld: section .bootpg loaded at [00000000effff000,00000000effff4c3] overlaps section .u_boot_list loaded at [00000000efffef60,00000000effff7fb] powerpc-linux-gnu-ld: u-boot: section .bootpg lma 0xeffff000 adjusted to 0xeffff7fc P2020DS_SDCARD: powerpc-linux-gnu-ld: section .bootpg loaded at [00000000f8fff000,00000000f8fff4b3] overlaps section .u_boot_list loaded at [00000000f8ffe874,00000000f8fff10f] powerpc-linux-gnu-ld: u-boot: section .bootpg lma 0xf8fff000 adjusted to 0xf8fff110 P2020DS_SPIFLASH: powerpc-linux-gnu-ld: section .bootpg loaded at [00000000f8fff000,00000000f8fff4b3] overlaps section .u_boot_list loaded at [00000000f8ffe778,00000000f8fff013] powerpc-linux-gnu-ld: u-boot: section .bootpg lma 0xf8fff000 adjusted to 0xf8fff014 Tom, There are also several boards that fail due to missing CONFIG_SYS_MPC85xx_DDR2_ADDR MPC8641HPCN_36BIT, MPC8641HPCN, xpedite517x. Cheers, -Joe

3 4

[U-Boot] [PATCH 0/6] m68k: Fixes for the m68k
by Marek Vasut 01 Nov '12

01 Nov '12

The m68k wasn't tested for a long time it seems, thus bugs crawled in. This series carries at least some basic fixes, yet bugs still prevail: Configuring for M5282EVB board... make: *** [u-boot] Error 1 m68k-linux-gnu-size: './u-boot': No such file common/libcommon.o:(.data.rel.env_ptr+0x0): undefined reference to `environment' make: *** [u-boot] Error 1 Configuring for astro_mcf5373l board... make: *** [u-boot] Error 1 m68k-linux-gnu-size: './u-boot': No such file cpu_init.c: In function 'cpu_init_f': cpu_init.c:227:10: warning: unused variable 'wdog' [-Wunused-variable] mcf5373l.c: In function 'initdram': mcf5373l.c:99:5: warning: pointer targets in passing argument 1 of 'get_ram_size' differ in signedness [-Wpointer-sign] In file included from mcf5373l.c:25:0: /tmp/u-boot/include/common.h:422:6: note: expected 'long int *' but argument is of type 'long unsigned int *' fpga.c:185:2: warning: initialization from incompatible pointer type [enabled by default] fpga.c:185:2: warning: (near initialization for 'altera_fns.write') [enabled by default] fpga.c: In function 'astro5373l_altera_load': fpga.c:213:20: warning: assignment from incompatible pointer type [enabled by default] m68k-linux-gnu-ld.bfd: cannot find lib/zlib.o make: *** [u-boot] Error 1 Configuring for M52277EVB_stmicro - Board: M52277EVB, Options: CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000 text data bss dec hex filename 105755 8186 4080 118021 1cd05 ./u-boot cpu_init.c: In function 'cpu_init_f': cpu_init.c:47:9: warning: unused variable 'pll' [-Wunused-variable] cpu_init.c:46:10: warning: unused variable 'fbcs' [-Wunused-variable] cpu_init.c:44:10: warning: unused variable 'scm1' [-Wunused-variable] Configuring for M5235EVB - Board: M5235EVB, Options: SYS_TEXT_BASE=0xFFE00000 text data bss dec hex filename 127862 9326 21096 158284 26a4c ./u-boot cpu_init.c: In function 'cpu_init_f': cpu_init.c:64:2: warning: passing argument 1 of 'out_be32' from incompatible pointer type [enabled by default] In file included from cpu_init.c:31:0: /tmp/u-boot/include/asm/io.h:223:20: note: expected 'volatile unsigned int *' but argument is of type 'u16 *' cpu_init.c:65:2: warning: passing argument 1 of 'out_be32' from incompatible pointer type [enabled by default] In file included from cpu_init.c:31:0: /tmp/u-boot/include/asm/io.h:223:20: note: expected 'volatile unsigned int *' but argument is of type 'u16 *' Configuring for M5235EVB_Flash32 - Board: M5235EVB, Options: NORFLASH_PS32BIT,SYS_TEXT_BASE=0xFFC00000 text data bss dec hex filename 127862 9326 21096 158284 26a4c ./u-boot cpu_init.c: In function 'cpu_init_f': cpu_init.c:64:2: warning: passing argument 1 of 'out_be32' from incompatible pointer type [enabled by default] In file included from cpu_init.c:31:0: /tmp/u-boot/include/asm/io.h:223:20: note: expected 'volatile unsigned int *' but argument is of type 'u16 *' cpu_init.c:65:2: warning: passing argument 1 of 'out_be32' from incompatible pointer type [enabled by default] In file included from cpu_init.c:31:0: /tmp/u-boot/include/asm/io.h:223:20: note: expected 'volatile unsigned int *' but argument is of type 'u16 *' Configuring for idmr board... text data bss dec hex filename 105682 8298 21756 135736 21238 ./u-boot cpu_init.c: In function 'init_fbcs': cpu_init.c:60:2: warning: #warning "Chip Select 0 are not initialized/used" [-Wcpp] cpu_init.c:52:10: warning: unused variable 'fbcs' [-Wunused-variable] Configuring for eb_cpu5282 - Board: eb_cpu5282, Options: SYS_TEXT_BASE=0xFFE00000 text data bss dec hex filename 102264 9082 37412 148758 24516 ./u-boot bus_vcxk.c: In function 'vcxk_init': bus_vcxk.c:156:2: warning: format '%lx' expects argument of type 'long unsigned int', but argument 2 has type 'u_char *' [-Wformat] bus_vcxk.c:156:2: warning: format '%lx' expects argument of type 'long unsigned int', but argument 3 has type 'u_short *' [-Wformat] bus_vcxk.c:156:2: warning: format '%lx' expects argument of type 'long unsigned int', but argument 4 has type 'u_long *' [-Wformat] cfm_flash.c: In function 'cfm_flash_init': cfm_flash.c:62:2: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long int' [-Wformat] cfm_flash.c:62:2: warning: format '%ld' expects argument of type 'long int', but argument 4 has type 'int' [-Wformat] eb_cpu5282.c: In function 'drv_video_init': eb_cpu5282.c:184:3: warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'long unsigned int' [-Wformat] Configuring for eb_cpu5282_internal - Board: eb_cpu5282, Options: SYS_TEXT_BASE=0xF0000000 text data bss dec hex filename 102373 9086 37412 148871 24587 ./u-boot bus_vcxk.c: In function 'vcxk_init': bus_vcxk.c:156:2: warning: format '%lx' expects argument of type 'long unsigned int', but argument 2 has type 'u_char *' [-Wformat] bus_vcxk.c:156:2: warning: format '%lx' expects argument of type 'long unsigned int', but argument 3 has type 'u_short *' [-Wformat] bus_vcxk.c:156:2: warning: format '%lx' expects argument of type 'long unsigned int', but argument 4 has type 'u_long *' [-Wformat] eb_cpu5282.c: In function 'drv_video_init': eb_cpu5282.c:184:3: warning: format '%x' expects argument of type 'unsigned int', but argument 2 has type 'long unsigned int' [-Wformat] cfm_flash.c: In function 'cfm_flash_init': cfm_flash.c:62:2: warning: format '%d' expects argument of type 'int', but argument 3 has type 'long int' [-Wformat] cfm_flash.c:62:2: warning: format '%ld' expects argument of type 'long int', but argument 4 has type 'int' [-Wformat] Configuring for M5253DEMO board... text data bss dec hex filename 142930 9132 222316 374378 5b66a ./u-boot flash.c: In function 'flash_erase': flash.c:196:21: warning: variable 'last' set but not used [-Wunused-but-set-variable] flash.c: In function 'write_buff': flash.c:338:10: warning: variable 'port_width' set but not used [-Wunused-but-set-variable] --------------------- SUMMARY ---------------------------- Boards compiled: 9 Boards with errors: 2 ( M5282EVB astro_mcf5373l ) Boards with warnings but no errors: 7 ( M52277EVB_stmicro M5235EVB M5235EVB_Flash32 idmr eb_cpu5282 eb_cpu5282_internal M5253DEMO ) ---------------------------------------------------------- Marek Vasut (5): m68k: Fix wrong assembler instruction in start.S m68k: Fix unused variable warning m68k: Fix unused variable warning in speed.c m68k: Fix unused variable in board.c m68k: net: Fix unused variable in mcfmii.c Philippe De Muyter (1): m68k: Fix relocation errors in start.S arch/m68k/cpu/mcf5227x/start.S | 2 +- arch/m68k/cpu/mcf523x/start.S | 2 +- arch/m68k/cpu/mcf52x2/start.S | 2 +- arch/m68k/cpu/mcf532x/start.S | 2 +- arch/m68k/cpu/mcf5445x/cpu_init.c | 3 ++- arch/m68k/cpu/mcf5445x/speed.c | 9 +++++++-- arch/m68k/cpu/mcf547x_8x/start.S | 4 ++-- arch/m68k/lib/board.c | 3 ++- drivers/net/mcfmii.c | 4 +--- 9 files changed, 18 insertions(+), 13 deletions(-) Cc: "Jin Zhengxiong-R64188" <R64188(a)freescale.com> Cc: Jason Jin <jason.jin(a)freescale.com> -- 1.7.10.4

2 8

Re: [U-Boot] [PATCH] powerpc/esdhc: force the bus width to 4bit
by Marek Vasut 01 Nov '12

01 Nov '12

Dear Huang Changming-R66093, Reposting _AGAIN_ because you again discarded the U-Boot ML address. > Best Regards > Jerry Huang Can you please fix your mailer? > > -----Original Message----- > > From: Marek Vasut [mailto:marex@denx.de] > > Sent: Thursday, November 01, 2012 10:26 AM > > To: Huang Changming-R66093 > > Cc: Andy Fleming; u-boot(a)linux.freescale.net > > Subject: Re: [PATCH] powerpc/esdhc: force the bus width to 4bit > > > > Dear Huang Changming-R66093, > > > > > Andy, > > > Do you agree my suggest to revert these codes to fix this issue? > > > > Please ... do us all a favor, read [1] and stop being so inconsiderate of > > others! Given that I can no longer make any sense of this thread because > > of your > > top-posting making it complete utmost mess, my opinion is NAK on > > reverting them. > > > > [1] http://www.ietf.org/rfc/rfc1855.txt > > Then, could you give some suggest, how to fix the 12bit-width issue? see drivers/mmc/mmc.c: 1089 width = ((mmc->host_caps & MMC_MODE_MASK_WIDTH_BITS) >> 1090 MMC_MODE_WIDTH_BITS_SHIFT); Fix this snipped of code and the related code below ... that's the way to go about it. Best regards, Marek Vasut

2 1

Re: [U-Boot] [PATCH v2 1/1] Coldfire: add amcore board support
by Jin Zhengxiong-R64188 01 Nov '12

01 Nov '12

From: angelo [mailto:angelo70@gmail.com] Sent: Wednesday, October 31, 2012 5:01 PM To: U-Boot(a)lists.denx.de Cc: Jin Zhengxiong-R64188 Subject: [PATCH v2 1/1] Coldfire: add amcore board support This patch adds support for the amcore board, mcf5307 based. Patch adds also support for mcf5307. Signed-off-by: Angelo Dureghello <sysamfw(a)gmail.com> Cc: Jason Jin <jason.jin(a)freescale.com> --- Changes in v2: - Added missing entry to MAINTAINERS - Added missing entry to boards.cfg --- MAINTAINERS | 4 + arch/m68k/cpu/mcf530x/Makefile | 48 ++++ arch/m68k/cpu/mcf530x/config.mk | 30 +++ arch/m68k/cpu/mcf530x/cpu.c | 48 ++++ arch/m68k/cpu/mcf530x/cpu.h | 33 +++ arch/m68k/cpu/mcf530x/cpu_init.c | 160 +++++++++++++ arch/m68k/cpu/mcf530x/interrupts.c | 43 ++++ arch/m68k/cpu/mcf530x/speed.c | 38 +++ arch/m68k/cpu/mcf530x/start.S | 253 ++++++++++++++++++++ arch/m68k/include/asm/cache.h | 2 +- arch/m68k/include/asm/immap.h | 22 ++ arch/m68k/include/asm/immap_5307.h | 78 ++++++ arch/m68k/include/asm/m5307.h | 123 ++++++++++ board/sysam/amcore/Makefile | 43 ++++ board/sysam/amcore/amcore.c | 174 ++++++++++++++ board/sysam/amcore/config.mk | 23 ++ board/sysam/amcore/flash.c | 462 ++++++++++++++++++++++++++++++++++++ board/sysam/amcore/u-boot.lds | 101 ++++++++ boards.cfg | 1 + include/configs/amcore.h | 193 +++++++++++++++ include/flash.h | 1 + 21 files changed, 1879 insertions(+), 1 deletion(-) -------------------------------------- The patches have format issues, Please try git-send-email to send the patches with plain text format. Please use clear description for the patch name and patch description. You have the same name for two different patches. It seems this patch is a combination of the other two patches, Please separate the patches into cpu related patches and board related patches. Thanks. Jason

1 0

Re: [U-Boot] [PATCH] powerpc/esdhc: force the bus width to 4bit
by Marek Vasut 01 Nov '12

01 Nov '12

Dear Huang Changming-R66093, Fixing the ML address ... and reposting the rest. > Andy, > Do you agree my suggest to revert these codes to fix this issue? Please ... do us all a favor, read [1] and stop being so inconsiderate of others! Given that I can no longer make any sense of this thread because of your top-posting making it complete utmost mess, my opinion is NAK on reverting them. [1] http://www.ietf.org/rfc/rfc1855.txt > Best Regards > Jerry Huang > > > -----Original Message----- > > From: u-boot-bounces(a)linux.freescale.net [mailto:u-boot- > > bounces(a)linux.freescale.net] On Behalf Of Huang Changming-R66093 > > Sent: Wednesday, October 31, 2012 10:08 AM > > To: Andy Fleming; Marek Vasut > > Cc: u-boot(a)linux.freescale.net > > Subject: Re: [u-boot] [PATCH] powerpc/esdhc: force the bus width to 4bit > > > > Below is the old codes (width = 2): > > > > } else { > > > > for (width = EXT_CSD_BUS_WIDTH_8; width >= 0; width--) { > > > > the current codes for MMC card has been changed to: > > > > } else { > > > > width = ((mmc->host_caps & MMC_MODE_MASK_WIDTH_BITS) >> > > > > MMC_MODE_WIDTH_BITS_SHIFT); > > > > for (; width >= 0; width--) { > > .... > > > > FSL ESDHC driver set the host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT; > > So for FSL ESDHC, the width = 3, after implement mmc_switch successfully, > > will set the bus to 4 * width. > > Therefore, I will get the 12bit (4 x 3) bus width. > > > > I don't know why do this modification? > > If to fix the stack bug, then I need to revert these codes. > > Andy, do you agree it? > > > > Best Regards > > Jerry Huang > > > > > -----Original Message----- > > > From: Andy Fleming [mailto:afleming@gmail.com] > > > Sent: Tuesday, October 30, 2012 10:34 PM > > > To: Marek Vasut > > > Cc: Huang Changming-R66093; u-boot(a)linux.freescale.net > > > Subject: Re: [PATCH] powerpc/esdhc: force the bus width to 4bit > > > > > > On Oct 30, 2012, at 5:50, Marek Vasut <marex(a)denx.de> wrote: > > > > Dear Chang-Ming.Huang(a)freescale.com, > > > > > > > >> From: Jerry Huang <Chang-Ming.Huang(a)freescale.com> > > > >> > > > >> For the current u-boot codes, only 4bit/1bit SD/SDHC bus width is > > > > > > support. > > > > > > >> So for MMC card, we also support 4bit bus width, otherwiase, we will > > > > > > > >> get the 12bit bus width, which is not correct: > > > > [...] > > > > > > > >> --- a/drivers/mmc/fsl_esdhc.c > > > >> +++ b/drivers/mmc/fsl_esdhc.c > > > >> @@ -577,7 +577,7 @@ int fsl_esdhc_initialize(bd_t *bis, struct > > > >> fsl_esdhc_cfg *cfg) return -1; > > > >> > > > >> } > > > >> > > > >> - mmc->host_caps = MMC_MODE_4BIT | MMC_MODE_8BIT; > > > >> + mmc->host_caps = MMC_MODE_4BIT; > > > > > > > > This fix is not correct, fix the MMC subsystem please. > > > > > > Agreed. Bit width just needs smarter printing. Unless this patch is > > > > doing > > > > > more than ensuring the printout is correct > > > > > > Andy > > > > _______________________________________________ > > u-boot mailing list > > u-boot(a)linux.freescale.net > > http://linux.freescale.net/mailman/listinfo/u-boot

1 0

[U-Boot] [PATCH] am33xx: pmic: Add support for tps65217
by Joel A Fernandes 01 Nov '12

01 Nov '12

This is mostly copied from "support for TPS65217 PMIC" patches from the old am33xx U-boot tree by Greg Guyyote with additions by Tom Rini, me and others. Also drop DDR3 voltage level from 1.5V to 1.35V for beaglebone. DDR3 operation is verified at this lower voltage level. Signed-off-by: Joel A Fernandes <joelagnel(a)ti.com> --- arch/arm/cpu/armv7/am33xx/board.c | 134 ++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv7/am33xx/pmic.h | 76 +++++++++++++++++++ arch/arm/cpu/armv7/am33xx/tps65217.h | 90 +++++++++++++++++++++++ 3 files changed, 300 insertions(+) create mode 100644 arch/arm/cpu/armv7/am33xx/pmic.h create mode 100644 arch/arm/cpu/armv7/am33xx/tps65217.h diff --git a/arch/arm/cpu/armv7/am33xx/board.c b/arch/arm/cpu/armv7/am33xx/board.c index 6de03fd..075295c 100644 --- a/arch/arm/cpu/armv7/am33xx/board.c +++ b/arch/arm/cpu/armv7/am33xx/board.c @@ -33,6 +33,8 @@ #include <i2c.h> #include <miiphy.h> #include <cpsw.h> +#include "pmic.h" +#include "tps65217.h" DECLARE_GLOBAL_DATA_PTR; @@ -135,6 +137,132 @@ static short inline board_memory_type(void) return EMIF_REG_SDRAM_TYPE_DDR2; } +/** + * tps65217_reg_read() - Generic function that can read a TPS65217 register + * @src_reg: Source register address + * @src_val: Address of destination variable + */ + +unsigned char tps65217_reg_read(uchar src_reg, uchar *src_val) +{ + if (i2c_read(TPS65217_CHIP_PM, src_reg, 1, src_val, 1)) + return 1; + return 0; +} + +/** + * tps65217_reg_write() - Generic function that can write a TPS65217 PMIC + * register or bit field regardless of protection + * level. + * + * @prot_level: Register password protection. + * use PROT_LEVEL_NONE, PROT_LEVEL_1, or PROT_LEVEL_2 + * @dest_reg: Register address to write. + * @dest_val: Value to write. + * @mask: Bit mask (8 bits) to be applied. Function will only + * change bits that are set in the bit mask. + * + * @return: 0 for success, 1 for failure. + */ +int tps65217_reg_write(uchar prot_level, uchar dest_reg, + uchar dest_val, uchar mask) +{ + uchar read_val; + uchar xor_reg; + + /* if we are affecting only a bit field, read dest_reg and apply the mask */ + if (mask != MASK_ALL_BITS) { + if (i2c_read(TPS65217_CHIP_PM, dest_reg, 1, &read_val, 1)) + return 1; + read_val &= (~mask); + read_val |= (dest_val & mask); + dest_val = read_val; + } + + if (prot_level > 0) { + xor_reg = dest_reg ^ PASSWORD_UNLOCK; + if (i2c_write(TPS65217_CHIP_PM, PASSWORD, 1, &xor_reg, 1)) + return 1; + } + + if (i2c_write(TPS65217_CHIP_PM, dest_reg, 1, &dest_val, 1)) + return 1; + + if (prot_level == PROT_LEVEL_2) { + if (i2c_write(TPS65217_CHIP_PM, PASSWORD, 1, &xor_reg, 1)) + return 1; + + if (i2c_write(TPS65217_CHIP_PM, dest_reg, 1, &dest_val, 1)) + return 1; + } + + return 0; +} + +int tps65217_voltage_update(unsigned char dc_cntrl_reg, unsigned char volt_sel) +{ + if ((dc_cntrl_reg != DEFDCDC1) && (dc_cntrl_reg != DEFDCDC2) + && (dc_cntrl_reg != DEFDCDC3)) + return 1; + + /* set voltage level */ + if (tps65217_reg_write(PROT_LEVEL_2, dc_cntrl_reg, volt_sel, MASK_ALL_BITS)) + return 1; + + /* set GO bit to initiate voltage transition */ + if (tps65217_reg_write(PROT_LEVEL_2, DEFSLEW, DCDC_GO, DCDC_GO)) + return 1; + + return 0; +} + +/* + * voltage switching for MPU frequency switching. + * @module = mpu - 0, core - 1 + * @vddx_op_vol_sel = vdd voltage to set + */ + +#define MPU 0 +#define CORE 1 + +int voltage_update(unsigned int module, unsigned char vddx_op_vol_sel) +{ + uchar buf[4]; + unsigned int reg_offset; + + if(module == MPU) + reg_offset = PMIC_VDD1_OP_REG; + else + reg_offset = PMIC_VDD2_OP_REG; + + /* Select VDDx OP */ + if (i2c_read(PMIC_CTRL_I2C_ADDR, reg_offset, 1, buf, 1)) + return 1; + + buf[0] &= ~PMIC_OP_REG_CMD_MASK; + + if (i2c_write(PMIC_CTRL_I2C_ADDR, reg_offset, 1, buf, 1)) + return 1; + + /* Configure VDDx OP Voltage */ + if (i2c_read(PMIC_CTRL_I2C_ADDR, reg_offset, 1, buf, 1)) + return 1; + + buf[0] &= ~PMIC_OP_REG_SEL_MASK; + buf[0] |= vddx_op_vol_sel; + + if (i2c_write(PMIC_CTRL_I2C_ADDR, reg_offset, 1, buf, 1)) + return 1; + + if (i2c_read(PMIC_CTRL_I2C_ADDR, reg_offset, 1, buf, 1)) + return 1; + + if ((buf[0] & PMIC_OP_REG_SEL_MASK ) != vddx_op_vol_sel) + return 1; + + return 0; +} + /* * early system init of muxing and clocks. */ @@ -190,6 +318,12 @@ void s_init(void) gpio_request(GPIO_DDR_VTT_EN, "ddr_vtt_en"); gpio_direction_output(GPIO_DDR_VTT_EN, 1); } + /* Set DCDC2 (MPU) voltage to 1.275V */ + if (tps65217_voltage_update(DEFDCDC1, + DCDC_VOLT_SEL_135MV)) { + printf("tps65217_voltage_update failure\n"); + return; + } config_ddr(board_memory_type()); #endif diff --git a/arch/arm/cpu/armv7/am33xx/pmic.h b/arch/arm/cpu/armv7/am33xx/pmic.h new file mode 100644 index 0000000..e258c44 --- /dev/null +++ b/arch/arm/cpu/armv7/am33xx/pmic.h @@ -0,0 +1,76 @@ +/* + * pmic.h + * + * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.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 version 2. + * + * This program is distributed "as is" WITHOUT ANY WARRANTY of any + * kind, whether express or implied; without even the implied warranty + * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ +#ifndef PMIC_h +#define PMIC_H + +/* + * The PMIC on this board is a TPS65910. + */ + +#define PMIC_SR_I2C_ADDR 0x12 +#define PMIC_CTRL_I2C_ADDR 0x2D +/* PMIC Register offsets */ +#define PMIC_VDD1_REG 0x21 +#define PMIC_VDD1_OP_REG 0x22 +#define PMIC_VDD2_REG 0x24 +#define PMIC_VDD2_OP_REG 0x25 +#define PMIC_DEVCTRL_REG 0x3f + +/* VDD2 & VDD1 control register (VDD2_REG & VDD1_REG) */ +#define PMIC_VGAIN_SEL_MASK (0x3 << 6) +#define PMIC_ILMAX_MASK (0x1 << 5) +#define PMIC_TSTEP_MASK (0x7 << 2) +#define PMIC_ST_MASK (0x3) + +#define PMIC_REG_VGAIN_SEL_X1 (0x0 << 6) +#define PMIC_REG_VGAIN_SEL_X1_0 (0x1 << 6) +#define PMIC_REG_VGAIN_SEL_X3 (0x2 << 6) +#define PMIC_REG_VGAIN_SEL_X4 (0x3 << 6) + +#define PMIC_REG_ILMAX_1_0_A (0x0 << 5) +#define PMIC_REG_ILMAX_1_5_A (0x1 << 5) + +#define PMIC_REG_TSTEP_ (0x0 << 2) +#define PMIC_REG_TSTEP_12_5 (0x1 << 2) +#define PMIC_REG_TSTEP_9_4 (0x2 << 2) +#define PMIC_REG_TSTEP_7_5 (0x3 << 2) +#define PMIC_REG_TSTEP_6_25 (0x4 << 2) +#define PMIC_REG_TSTEP_4_7 (0x5 << 2) +#define PMIC_REG_TSTEP_3_12 (0x6 << 2) +#define PMIC_REG_TSTEP_2_5 (0x7 << 2) + +#define PMIC_REG_ST_OFF (0x0) +#define PMIC_REG_ST_ON_HI_POW (0x1) +#define PMIC_REG_ST_OFF_1 (0x2) +#define PMIC_REG_ST_ON_LOW_POW (0x3) + + +/* VDD2 & VDD1 voltage selection register. (VDD2_OP_REG & VDD1_OP_REG) */ +#define PMIC_OP_REG_SEL (0x7F) + +#define PMIC_OP_REG_CMD_MASK (0x1 << 7) +#define PMIC_OP_REG_CMD_OP (0x0 << 7) +#define PMIC_OP_REG_CMD_SR (0x1 << 7) + +#define PMIC_OP_REG_SEL_MASK (0x7F) +#define PMIC_OP_REG_SEL_1_1_3 (0x2E) /* 1.1375 V */ +#define PMIC_OP_REG_SEL_1_2_6 (0x38) /* 1.2625 V */ + +/* Device control register . (DEVCTRL_REG) */ +#define PMIC_DEVCTRL_REG_SR_CTL_I2C_MASK (0x1 << 4) +#define PMIC_DEVCTRL_REG_SR_CTL_I2C_SEL_SR_I2C (0x0 << 4) +#define PMIC_DEVCTRL_REG_SR_CTL_I2C_SEL_CTL_I2C (0x1 << 4) + +#endif diff --git a/arch/arm/cpu/armv7/am33xx/tps65217.h b/arch/arm/cpu/armv7/am33xx/tps65217.h new file mode 100644 index 0000000..3197209 --- /dev/null +++ b/arch/arm/cpu/armv7/am33xx/tps65217.h @@ -0,0 +1,90 @@ +/* + * (C) Copyright 2011 + * Texas Instruments, <www.ti.com> + * + * 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 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. + * + * 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 + */ + +#ifndef __TPS65217_H__ +#define __TPS65217_H__ + +#include <common.h> +#include <i2c.h> + +/* I2C chip address */ +#define TPS65217_CHIP_PM 0x24 + +/* Registers */ +#define CHIPID 0x00 +#define POWER_PATH 0x01 +#define INTERRUPT 0x02 +#define CHGCONFIG0 0x03 +#define CHGCONFIG1 0x04 +#define CHGCONFIG2 0x05 +#define CHGCONFIG3 0x06 +#define WLEDCTRL1 0x07 +#define WLEDCTRL2 0x08 +#define MUXCTRL 0x09 +#define STATUS 0x0A +#define PASSWORD 0x0B +#define PGOOD 0x0C +#define DEFPG 0x0D +#define DEFDCDC1 0x0E +#define DEFDCDC2 0x0F +#define DEFDCDC3 0x10 +#define DEFSLEW 0x11 +#define DEFLDO1 0x12 +#define DEFLDO2 0x13 +#define DEFLS1 0x14 +#define DEFLS2 0x15 +#define ENABLE 0x16 +#define DEFUVLO 0x18 +#define SEQ1 0x19 +#define SEQ2 0x1A +#define SEQ3 0x1B +#define SEQ4 0x1C +#define SEQ5 0x1D +#define SEQ6 0x1E + +#define PROT_LEVEL_NONE 0x00 +#define PROT_LEVEL_1 0x01 +#define PROT_LEVEL_2 0x02 + +#define PASSWORD_LOCK_FOR_WRITE 0x00 +#define PASSWORD_UNLOCK 0x7D + +#define DCDC_GO 0x80 + +#define MASK_ALL_BITS 0xFF + +#define USB_INPUT_CUR_LIMIT_MASK 0x03 +#define USB_INPUT_CUR_LIMIT_100MA 0x00 +#define USB_INPUT_CUR_LIMIT_500MA 0x01 +#define USB_INPUT_CUR_LIMIT_1300MA 0x02 +#define USB_INPUT_CUR_LIMIT_1800MA 0x03 + +#define DCDC_VOLT_SEL_1275MV 0x0F +#define DCDC_VOLT_SEL_135MV 0x12 + +#define LDO_MASK 0x1F +#define LDO_VOLTAGE_OUT_3_3 0x1F + +#define PWR_SRC_USB_BITMASK 0x4 +#define PWR_SRC_AC_BITMASK 0x8 +#endif -- 1.7.9.5

2 1

[U-Boot] [PATCH] common: Link with GCC instead of LD
by Marek Vasut 01 Nov '12

01 Nov '12

Flip over from linking with LD to linking with GCC. This has some long-term benefits, like easy path to enabling LTO. Most of this patch is about passing parameters to the linker invoked by GCC at the linking stage. This involves prefixing most of these with -Wl,<param> . A few more adjustments had to be made though. The LDFLAGS had to be extended by --build-id=none to prevent generation of the .note.gnu.build-id section, which contains unique build-id we don't care about. Moreover -nostdlib had to be added to LDFLAGS to link properly without pulling in GCC libs during partial link. The LDFLAGS_FINAL had to be augmented by -Wl,-allow-multiple-definition to prevent GCC from complaining about multiple definitions of the register containing global data. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Albert Aribaud <albert.u.boot(a)aribaud.net> Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Mike Frysinger <vapier(a)gentoo.org> Cc: Tom Rini <trini(a)ti.com> Cc: Wolfgang Denk <wd(a)denx.de> --- Makefile | 4 ++-- arch/avr32/config.mk | 2 +- arch/blackfin/config.mk | 4 ++-- arch/m68k/config.mk | 4 ++-- arch/m68k/cpu/mcf5445x/config.mk | 2 +- arch/m68k/cpu/mcf547x_8x/config.mk | 2 +- arch/mips/config.mk | 4 ++-- arch/mips/cpu/mips64/config.mk | 4 ++-- arch/nds32/config.mk | 2 +- arch/nios2/config.mk | 2 +- arch/powerpc/config.mk | 2 +- arch/sh/config.mk | 4 ++-- arch/x86/config.mk | 8 ++++---- board/ait/cam_enc_4xx/config.mk | 2 +- config.mk | 15 +++++++-------- examples/standalone/Makefile | 4 ++-- nand_spl/board/amcc/acadia/Makefile | 2 +- nand_spl/board/amcc/bamboo/Makefile | 2 +- nand_spl/board/amcc/canyonlands/Makefile | 2 +- nand_spl/board/amcc/kilauea/Makefile | 2 +- nand_spl/board/amcc/sequoia/Makefile | 2 +- nand_spl/board/freescale/mpc8313erdb/Makefile | 2 +- nand_spl/board/freescale/mpc8315erdb/Makefile | 2 +- nand_spl/board/freescale/mpc8536ds/Makefile | 2 +- nand_spl/board/freescale/mpc8569mds/Makefile | 2 +- nand_spl/board/freescale/mpc8572ds/Makefile | 2 +- nand_spl/board/freescale/mx31pdk/Makefile | 2 +- nand_spl/board/freescale/p1010rdb/Makefile | 2 +- nand_spl/board/freescale/p1023rds/Makefile | 2 +- nand_spl/board/freescale/p1_p2_rdb/Makefile | 2 +- nand_spl/board/freescale/p1_p2_rdb_pc/Makefile | 2 +- nand_spl/board/karo/tx25/Makefile | 2 +- nand_spl/board/samsung/smdk6400/Makefile | 2 +- nand_spl/board/sheldon/simpc8313/Makefile | 2 +- spl/Makefile | 4 ++-- 35 files changed, 52 insertions(+), 53 deletions(-) NOTE: It should mostly work, but _PLEASE_ test it properly. I definitelly can not run it on most of the affected platforms. Besides, it might still hit some build issues, it's not properly compiler-tested. Any additional fixes are welcome ;-) NOTE: I detected code size being smaller by a few bytes, but then it might cause breakage, so I'd be really cautious here. diff --git a/Makefile b/Makefile index 2fe1490..d6b3433 100644 --- a/Makefile +++ b/Makefile @@ -539,8 +539,8 @@ GEN_UBOOT = \ sed -n -e 's/.*$$(SYM_PREFIX)_u_boot_list_.*$/-u\1/p'|sort|uniq`;\ cd $(LNDIR) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) \ $$UNDEF_LST $(__OBJS) \ - --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \ - -Map u-boot.map -o u-boot + -Wl,--start-group $(__LIBS) -Wl,--end-group \ + $(PLATFORM_LIBS) -Wl,-Map -Wl,u-boot.map -o u-boot endif $(obj)u-boot: depend \ diff --git a/arch/avr32/config.mk b/arch/avr32/config.mk index a751a3d..151f232 100644 --- a/arch/avr32/config.mk +++ b/arch/avr32/config.mk @@ -28,4 +28,4 @@ CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 PLATFORM_RELFLAGS += -ffixed-r5 -fPIC -mno-init-got -mrelax PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -LDFLAGS_u-boot = --gc-sections --relax +LDFLAGS_u-boot = -Wl,--gc-sections -Wl,--relax diff --git a/arch/blackfin/config.mk b/arch/blackfin/config.mk index 3595aa2..cbfba5f 100644 --- a/arch/blackfin/config.mk +++ b/arch/blackfin/config.mk @@ -37,8 +37,8 @@ CONFIG_BFIN_BOOT_MODE := $(strip $(subst ",,$(CONFIG_BFIN_BOOT_MODE))) PLATFORM_RELFLAGS += -ffixed-P3 -fomit-frame-pointer -mno-fdpic PLATFORM_CPPFLAGS += -DCONFIG_BLACKFIN -LDFLAGS_FINAL += --gc-sections -LDFLAGS += -m elf32bfin +LDFLAGS_FINAL += -Wl,--gc-sections +LDFLAGS += -Wl,-m elf32bfin PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU) diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk index 11ba334..2e5adb9 100644 --- a/arch/m68k/config.mk +++ b/arch/m68k/config.mk @@ -26,6 +26,6 @@ CROSS_COMPILE ?= m68k-elf- CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000 PLATFORM_CPPFLAGS += -DCONFIG_M68K -D__M68K__ -PLATFORM_LDFLAGS += -n +PLATFORM_LDFLAGS += -Wl,-n PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -LDFLAGS_FINAL += --gc-sections +LDFLAGS_FINAL += -Wl,--gc-sections diff --git a/arch/m68k/cpu/mcf5445x/config.mk b/arch/m68k/cpu/mcf5445x/config.mk index 0c48783..bd216a9 100644 --- a/arch/m68k/cpu/mcf5445x/config.mk +++ b/arch/m68k/cpu/mcf5445x/config.mk @@ -38,6 +38,6 @@ endif ifneq (,$(findstring -linux-,$(shell $(CC) --version))) ifneq (,$(findstring GOT,$(shell $(LD) --help))) -PLATFORM_LDFLAGS += --got=single +PLATFORM_LDFLAGS += -Wl,--got=single endif endif diff --git a/arch/m68k/cpu/mcf547x_8x/config.mk b/arch/m68k/cpu/mcf547x_8x/config.mk index 02fce5d..00907d3 100644 --- a/arch/m68k/cpu/mcf547x_8x/config.mk +++ b/arch/m68k/cpu/mcf547x_8x/config.mk @@ -28,6 +28,6 @@ PLATFORM_CPPFLAGS += -mcpu=5485 -fPIC ifneq (,$(findstring -linux-,$(shell $(CC) --version))) ifneq (,$(findstring GOT,$(shell $(LD) --help))) -PLATFORM_LDFLAGS += --got=single +PLATFORM_LDFLAGS += -Wl,--got=single endif endif diff --git a/arch/mips/config.mk b/arch/mips/config.mk index de9140b..c21d313 100644 --- a/arch/mips/config.mk +++ b/arch/mips/config.mk @@ -63,6 +63,6 @@ PLATFORM_CPPFLAGS += -DCONFIG_MIPS -D__MIPS__ # PLATFORM_CPPFLAGS += -G 0 -mabicalls -fpic $(ENDIANNESS) PLATFORM_CPPFLAGS += -msoft-float -PLATFORM_LDFLAGS += -G 0 -static -n -nostdlib $(ENDIANNESS) +PLATFORM_LDFLAGS += -G 0 -static -Wl,-n $(ENDIANNESS) PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -LDFLAGS_FINAL += --gc-sections +LDFLAGS_FINAL += -Wl,--gc-sections diff --git a/arch/mips/cpu/mips64/config.mk b/arch/mips/cpu/mips64/config.mk index ebc1ceb..d9fbf27 100644 --- a/arch/mips/cpu/mips64/config.mk +++ b/arch/mips/cpu/mips64/config.mk @@ -32,9 +32,9 @@ MIPSFLAGS = -march=mips64 PLATFORM_CPPFLAGS += $(MIPSFLAGS) PLATFORM_CPPFLAGS += -mabi=64 -DCONFIG_64BIT ifdef CONFIG_SYS_BIG_ENDIAN -PLATFORM_LDFLAGS += -m elf64btsmip +PLATFORM_LDFLAGS += -Wl,-m elf64btsmip else -PLATFORM_LDFLAGS += -m elf64ltsmip +PLATFORM_LDFLAGS += -Wl,-m elf64ltsmip endif CONFIG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000 -T mips64.lds diff --git a/arch/nds32/config.mk b/arch/nds32/config.mk index c589829..eccd2e6 100644 --- a/arch/nds32/config.mk +++ b/arch/nds32/config.mk @@ -32,4 +32,4 @@ PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -mrelax PLATFORM_RELFLAGS += -gdwarf-2 PLATFORM_CPPFLAGS += -DCONFIG_NDS32 -D__nds32__ -G0 -ffixed-10 -fpie -LDFLAGS_u-boot = --gc-sections --relax +LDFLAGS_u-boot = -Wl,--gc-sections -Wl,--relax diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk index 7b03ed8..9f9f6ac 100644 --- a/arch/nios2/config.mk +++ b/arch/nios2/config.mk @@ -29,5 +29,5 @@ CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000 PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__ PLATFORM_CPPFLAGS += -G0 -LDFLAGS_FINAL += --gc-sections +LDFLAGS_FINAL += -Wl,--gc-sections PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk index a307154..87e4934 100644 --- a/arch/powerpc/config.mk +++ b/arch/powerpc/config.mk @@ -24,7 +24,7 @@ CROSS_COMPILE ?= ppc_8xx- CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000 -LDFLAGS_FINAL += --gc-sections +LDFLAGS_FINAL += -Wl,--gc-sections PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections -fdata-sections PLATFORM_CPPFLAGS += -DCONFIG_PPC -D__powerpc__ PLATFORM_LDFLAGS += -n diff --git a/arch/sh/config.mk b/arch/sh/config.mk index 07ff8b9..3451223 100644 --- a/arch/sh/config.mk +++ b/arch/sh/config.mk @@ -29,5 +29,5 @@ CONFIG_STANDALONE_LOAD_ADDR += -EB endif PLATFORM_CPPFLAGS += -DCONFIG_SH -D__SH__ -PLATFORM_LDFLAGS += -e $(CONFIG_SYS_TEXT_BASE) --defsym reloc_dst=$(CONFIG_SYS_TEXT_BASE) -LDFLAGS_FINAL = --gc-sections +PLATFORM_LDFLAGS += -Wl,-e $(CONFIG_SYS_TEXT_BASE) -Wl,--defsym reloc_dst=$(CONFIG_SYS_TEXT_BASE) +LDFLAGS_FINAL = -Wl,--gc-sections diff --git a/arch/x86/config.mk b/arch/x86/config.mk index 23cacff..b3b07cc 100644 --- a/arch/x86/config.mk +++ b/arch/x86/config.mk @@ -38,11 +38,11 @@ PLATFORM_CPPFLAGS += -DREALMODE_BASE=0x7c0 PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden -PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions +PLATFORM_LDFLAGS += -Wl,--emit-relocs -Wl,-Bsymbolic -Wl,-Bsymbolic-functions -LDFLAGS_FINAL += --gc-sections -pie -LDFLAGS_FINAL += --wrap=__divdi3 --wrap=__udivdi3 -LDFLAGS_FINAL += --wrap=__moddi3 --wrap=__umoddi3 +LDFLAGS_FINAL += -Wl,--gc-sections -pie +LDFLAGS_FINAL += -Wl,--wrap=__divdi3 -Wl,--wrap=__udivdi3 +LDFLAGS_FINAL += -Wl,--wrap=__moddi3 -Wl,--wrap=__umoddi3 NORMAL_LIBGCC = $(shell $(CC) $(CFLAGS) -print-libgcc-file-name) PREFIXED_LIBGCC = $(OBJTREE)/arch/$(ARCH)/lib/$(shell basename $(NORMAL_LIBGCC)) diff --git a/board/ait/cam_enc_4xx/config.mk b/board/ait/cam_enc_4xx/config.mk index 744b927..0792c84 100644 --- a/board/ait/cam_enc_4xx/config.mk +++ b/board/ait/cam_enc_4xx/config.mk @@ -18,5 +18,5 @@ else # the following error message: # arm-linux-ld: u-boot-spl: Not enough room for program headers, try linking # with -N -LDFLAGS_u-boot-spl += -n +LDFLAGS_u-boot-spl += -Wl,-n endif diff --git a/config.mk b/config.mk index b7cd481..ec8cd6b 100644 --- a/config.mk +++ b/config.mk @@ -137,9 +137,8 @@ binutils-version = $(shell $(SHELL) $(SRCTREE)/tools/binutils-version.sh $(AS)) # AS = $(CROSS_COMPILE)as -# Always use GNU ld -LD = $(shell if $(CROSS_COMPILE)ld.bfd -v > /dev/null 2>&1; \ - then echo "$(CROSS_COMPILE)ld.bfd"; else echo "$(CROSS_COMPILE)ld"; fi;) +# Link with GCC +LD = $(CROSS_COMPILE)gcc CC = $(CROSS_COMPILE)gcc CPP = $(CC) -E @@ -202,7 +201,7 @@ CPPFLAGS := $(DBGFLAGS) $(OPTFLAGS) $(RELFLAGS) \ # Enable garbage collection of un-used sections for SPL ifeq ($(CONFIG_SPL_BUILD),y) CPPFLAGS += -ffunction-sections -fdata-sections -LDFLAGS_FINAL += --gc-sections +LDFLAGS_FINAL += -Wl,--gc-sections -Wl,--build-id=none endif ifneq ($(CONFIG_SYS_TEXT_BASE),) @@ -265,17 +264,17 @@ endif AFLAGS := $(AFLAGS_DEBUG) -D__ASSEMBLY__ $(CPPFLAGS) -LDFLAGS += $(PLATFORM_LDFLAGS) -LDFLAGS_FINAL += -Bstatic +LDFLAGS += $(PLATFORM_LDFLAGS) -Wl,--build-id=none -nostdlib +LDFLAGS_FINAL += -Wl,-Bstatic -Wl,-allow-multiple-definition LDFLAGS_u-boot += -T $(obj)u-boot.lds $(LDFLAGS_FINAL) ifneq ($(CONFIG_SYS_TEXT_BASE),) -LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE) +LDFLAGS_u-boot += -Wl,-Ttext -Wl,$(CONFIG_SYS_TEXT_BASE) endif LDFLAGS_u-boot-spl += -T $(obj)u-boot-spl.lds $(LDFLAGS_FINAL) ifneq ($(CONFIG_SPL_TEXT_BASE),) -LDFLAGS_u-boot-spl += -Ttext $(CONFIG_SPL_TEXT_BASE) +LDFLAGS_u-boot-spl += -Wl,-Ttext -Wl,$(CONFIG_SPL_TEXT_BASE) endif # Linus' kernel sanity checking tool diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile index baaa2fb..eaf8bb3 100644 --- a/examples/standalone/Makefile +++ b/examples/standalone/Makefile @@ -96,8 +96,8 @@ $(LIB): $(obj).depend $(LIBOBJS) $(ELF): $(obj)%: $(obj)%.o $(LIB) - $(LD) $(LDFLAGS) -g -Ttext $(CONFIG_STANDALONE_LOAD_ADDR) \ - -o $@ -e $(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \ + $(LD) $(LDFLAGS) -g -Wl,-Ttext -Wl,$(CONFIG_STANDALONE_LOAD_ADDR) \ + -o $@ -Wl,-e -Wl,$(SYM_PREFIX)$(notdir $(<:.o=)) $< $(LIB) \ -L$(gcclibdir) -lgcc $(SREC): diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile index 84cb8ab..6a75e34 100644 --- a/nand_spl/board/amcc/acadia/Makefile +++ b/nand_spl/board/amcc/acadia/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile index 6430219..5fa1a3b 100644 --- a/nand_spl/board/amcc/bamboo/Makefile +++ b/nand_spl/board/amcc/bamboo/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/amcc/canyonlands/Makefile b/nand_spl/board/amcc/canyonlands/Makefile index 509a46e..4e2eae4 100644 --- a/nand_spl/board/amcc/canyonlands/Makefile +++ b/nand_spl/board/amcc/canyonlands/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/amcc/kilauea/Makefile b/nand_spl/board/amcc/kilauea/Makefile index 104b7e2..55900ed 100644 --- a/nand_spl/board/amcc/kilauea/Makefile +++ b/nand_spl/board/amcc/kilauea/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/amcc/sequoia/Makefile b/nand_spl/board/amcc/sequoia/Makefile index 54e8a12..dc41c1f 100644 --- a/nand_spl/board/amcc/sequoia/Makefile +++ b/nand_spl/board/amcc/sequoia/Makefile @@ -27,7 +27,7 @@ include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/freescale/mpc8313erdb/Makefile b/nand_spl/board/freescale/mpc8313erdb/Makefile index cff2a43..9fe4472 100644 --- a/nand_spl/board/freescale/mpc8313erdb/Makefile +++ b/nand_spl/board/freescale/mpc8313erdb/Makefile @@ -30,7 +30,7 @@ include $(TOPDIR)/config.mk nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ $(LDFLAGS) $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/freescale/mpc8315erdb/Makefile b/nand_spl/board/freescale/mpc8315erdb/Makefile index cff2a43..9fe4472 100644 --- a/nand_spl/board/freescale/mpc8315erdb/Makefile +++ b/nand_spl/board/freescale/mpc8315erdb/Makefile @@ -30,7 +30,7 @@ include $(TOPDIR)/config.mk nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ $(LDFLAGS) $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/freescale/mpc8536ds/Makefile b/nand_spl/board/freescale/mpc8536ds/Makefile index e5388d8..6d91269 100644 --- a/nand_spl/board/freescale/mpc8536ds/Makefile +++ b/nand_spl/board/freescale/mpc8536ds/Makefile @@ -33,7 +33,7 @@ nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LSTSCRIPT= $(nandobj)/board/$(BOARDDIR)/u-boot.lst -LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ +LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ $(LDFLAGS) $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/freescale/mpc8569mds/Makefile b/nand_spl/board/freescale/mpc8569mds/Makefile index e5388d8..6d91269 100644 --- a/nand_spl/board/freescale/mpc8569mds/Makefile +++ b/nand_spl/board/freescale/mpc8569mds/Makefile @@ -33,7 +33,7 @@ nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LSTSCRIPT= $(nandobj)/board/$(BOARDDIR)/u-boot.lst -LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ +LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ $(LDFLAGS) $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/freescale/mpc8572ds/Makefile b/nand_spl/board/freescale/mpc8572ds/Makefile index e5388d8..6d91269 100644 --- a/nand_spl/board/freescale/mpc8572ds/Makefile +++ b/nand_spl/board/freescale/mpc8572ds/Makefile @@ -33,7 +33,7 @@ nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LSTSCRIPT= $(nandobj)/board/$(BOARDDIR)/u-boot.lst -LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ +LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ $(LDFLAGS) $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/freescale/mx31pdk/Makefile b/nand_spl/board/freescale/mx31pdk/Makefile index 43e72c4..1213cf2 100644 --- a/nand_spl/board/freescale/mx31pdk/Makefile +++ b/nand_spl/board/freescale/mx31pdk/Makefile @@ -7,7 +7,7 @@ nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LSTSCRIPT= $(nandobj)/board/$(BOARDDIR)/u-boot.lst -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL diff --git a/nand_spl/board/freescale/p1010rdb/Makefile b/nand_spl/board/freescale/p1010rdb/Makefile index f270faa..8dfaf0c 100644 --- a/nand_spl/board/freescale/p1010rdb/Makefile +++ b/nand_spl/board/freescale/p1010rdb/Makefile @@ -33,7 +33,7 @@ nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LSTSCRIPT= $(nandobj)/board/$(BOARDDIR)/u-boot.lst -LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) $(LDFLAGS) \ +LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) $(LDFLAGS) \ $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/freescale/p1023rds/Makefile b/nand_spl/board/freescale/p1023rds/Makefile index b288284..39b2588 100644 --- a/nand_spl/board/freescale/p1023rds/Makefile +++ b/nand_spl/board/freescale/p1023rds/Makefile @@ -28,7 +28,7 @@ nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LSTSCRIPT= $(nandobj)/board/$(BOARDDIR)/u-boot.lst -LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ +LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ $(LDFLAGS) $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/freescale/p1_p2_rdb/Makefile b/nand_spl/board/freescale/p1_p2_rdb/Makefile index e5388d8..6d91269 100644 --- a/nand_spl/board/freescale/p1_p2_rdb/Makefile +++ b/nand_spl/board/freescale/p1_p2_rdb/Makefile @@ -33,7 +33,7 @@ nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LSTSCRIPT= $(nandobj)/board/$(BOARDDIR)/u-boot.lst -LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ +LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ $(LDFLAGS) $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/freescale/p1_p2_rdb_pc/Makefile b/nand_spl/board/freescale/p1_p2_rdb_pc/Makefile index 7146d16..b3514ac 100644 --- a/nand_spl/board/freescale/p1_p2_rdb_pc/Makefile +++ b/nand_spl/board/freescale/p1_p2_rdb_pc/Makefile @@ -33,7 +33,7 @@ nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/$(CPUDIR)/u-boot-nand_spl.lds LSTSCRIPT= $(nandobj)/board/$(BOARDDIR)/u-boot.lst -LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ +LDFLAGS := -T $(nandobj)u-boot-nand_spl.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ $(LDFLAGS) $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/nand_spl/board/karo/tx25/Makefile b/nand_spl/board/karo/tx25/Makefile index becf7fa..628bfee 100644 --- a/nand_spl/board/karo/tx25/Makefile +++ b/nand_spl/board/karo/tx25/Makefile @@ -28,7 +28,7 @@ nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds LSTSCRIPT= $(nandobj)/board/$(BOARDDIR)/u-boot.lst -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL diff --git a/nand_spl/board/samsung/smdk6400/Makefile b/nand_spl/board/samsung/smdk6400/Makefile index c9e75ba..75b7b0f 100644 --- a/nand_spl/board/samsung/smdk6400/Makefile +++ b/nand_spl/board/samsung/smdk6400/Makefile @@ -32,7 +32,7 @@ include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \ $(LDFLAGS_FINAL) -gc-sections AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL -ffunction-sections diff --git a/nand_spl/board/sheldon/simpc8313/Makefile b/nand_spl/board/sheldon/simpc8313/Makefile index 2a3ddac..a73fa87 100644 --- a/nand_spl/board/sheldon/simpc8313/Makefile +++ b/nand_spl/board/sheldon/simpc8313/Makefile @@ -30,7 +30,7 @@ include $(TOPDIR)/config.mk nandobj := $(OBJTREE)/nand_spl/ LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ +LDFLAGS := -T $(nandobj)u-boot.lds -Wl,-Ttext $(CONFIG_SYS_TEXT_BASE_SPL) \ $(LDFLAGS) $(LDFLAGS_FINAL) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL diff --git a/spl/Makefile b/spl/Makefile index 3195390..6d9b4ae 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -139,8 +139,8 @@ $(obj)u-boot-spl.bin: $(obj)u-boot-spl GEN_UBOOT = \ cd $(obj) && $(LD) $(LDFLAGS) $(LDFLAGS_$(@F)) $(__START) \ - --start-group $(__LIBS) --end-group $(PLATFORM_LIBS) \ - -Map u-boot-spl.map -o u-boot-spl + -Wl,--start-group -Wl,$(__LIBS) -Wl,--end-group -Wl,$(PLATFORM_LIBS) \ + -Wl,-Map=u-boot-spl.map -o u-boot-spl $(obj)u-boot-spl: depend $(START) $(LIBS) $(obj)u-boot-spl.lds $(GEN_UBOOT) -- 1.7.10.4

4 11

[U-Boot] [PATCH v2 05/14] fdt: Remove fdtdec_find_alias_node() function
by Simon Glass 01 Nov '12

01 Nov '12

This function is not needed, since fdt_path_offset() performs the same service. Remove it. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - Remove fdtdec_find_alias_node() function lib/fdtdec.c | 24 +----------------------- 1 files changed, 1 insertions(+), 23 deletions(-) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 32f03cc..4d6d392 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -52,28 +52,6 @@ const char *fdtdec_get_compatible(enum fdt_compat_id id) return compat_names[id]; } -/** - * Look in the FDT for an alias with the given name and return its node. - * - * @param blob FDT blob - * @param name alias name to look up - * @return node offset if found, or an error code < 0 otherwise - */ -static int find_alias_node(const void *blob, const char *name) -{ - const char *path; - int alias_node; - - debug("find_alias_node: %s\n", name); - alias_node = fdt_path_offset(blob, "/aliases"); - if (alias_node < 0) - return alias_node; - path = fdt_getprop(blob, alias_node, name, NULL); - if (!path) - return -FDT_ERR_NOTFOUND; - return fdt_path_offset(blob, path); -} - fdt_addr_t fdtdec_get_addr(const void *blob, int node, const char *prop_name) { @@ -171,7 +149,7 @@ int fdtdec_next_alias(const void *blob, const char *name, /* snprintf() is not available */ assert(strlen(name) < MAX_STR_LEN); sprintf(str, "%.*s%d", MAX_STR_LEN, name, *upto); - node = find_alias_node(blob, str); + node = fdt_path_offset(blob, str); if (node < 0) return node; err = fdt_node_check_compatible(blob, node, compat_names[id]); -- 1.7.7.3

1 0