October 2012 - U-Boot

[U-Boot] [PATCH REPOST] ARM: tegra: use standard variables to define load addresses
by Stephen Warren 02 Oct '12

02 Oct '12

From: Stephen Warren <swarren(a)nvidia.com> Currently, Tegra's default environment uses non-standard variables to define where boot scripts should load the kernel, FDT, and initrd. This change both changes the variable names to match those described in U-Boot's README, and shuffles their values around a little so that the values make a little more sense; see comments in the patch for rationale behind the values chosen. Note that this patch does remove the old non-standard variable "fdt_load" from the default environment, so this patch requires people to change their boot scripts. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> Acked-by: Simon Glass <sjg(a)chromium.org> --- include/configs/tegra-common-post.h | 31 ++++++++++++++++++++++++++++--- 1 files changed, 28 insertions(+), 3 deletions(-) diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 1e7aea9..048ecbb 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -95,8 +95,6 @@ #endif #define BOOTCMDS_COMMON \ - "scriptaddr=0x400000\0" \ - \ "rootpart=1\0" \ \ "script_boot=" \ @@ -140,9 +138,36 @@ #endif +/* + * Memory layout for where various images get loaded by boot scripts: + * + * scriptaddr can be pretty much anywhere that doesn't conflict with something + * else. Put it above BOOTMAPSZ to eliminate conflicts. + * + * kernel_addr_r must be within the first 128M of RAM in order for the + * kernel's CONFIG_AUTO_ZRELADDR option to work. Since the kernel will + * decompress itself to 0x8000 after the start of RAM, kernel_addr_r + * should not overlap that area, or the kernel will have to copy itself + * somewhere else before decompression. Similarly, the address of any other + * data passed to the kernel shouldn't overlap the start of RAM. Pushing + * this up to 16M allows for a sizable kernel to be decompressed below the + * compressed load address. + * + * fdt_addr_r simply shouldn't overlap anything else. Choosing 32M allows for + * the compressed kernel to be up to 16M too. + * + * ramdisk_addr_r simply shouldn't overlap anything else. Choosing 33M allows + * for the FDT/DTB to be up to 1M, which is hopefully plenty. + */ +#define MEM_LAYOUT_ENV_SETTINGS \ + "scriptaddr=0x10000000\0" \ + "kernel_addr_r=0x01000000\0" \ + "fdt_addr_r=0x02000000\0" \ + "ramdisk_addr_r=0x02100000\0" \ + #define CONFIG_EXTRA_ENV_SETTINGS \ TEGRA_DEVICE_SETTINGS \ - "fdt_load=0x01000000\0" \ + MEM_LAYOUT_ENV_SETTINGS \ BOOTCMDS_COMMON /* overrides for SPL build here */ -- 1.7.0.4

1 0

[U-Boot] [PULL] u-boot-testing / dm-stringify
by Marek Vasut 02 Oct '12

02 Oct '12

Please apply to u-boot/next. They are now compile tested on arm and ppc. Albert's comment addresses and patches are assigned to Tom in PW. The following changes since commit d05eb7acf0f6ad5682ab75c25af52921e9fa5863: MAINTAINERS: Move dbau1x00 to orphaned. (2012-09-27 13:04:42 -0700) are available in the git repository at: git://git.denx.de/u-boot-testing.git dm-stringify for you to fetch changes up to 30d05ab5304eb34b15550ea95258b18904f3991c: COMMON: Use __stringify() instead of rest of implementations (2012-09-29 02:09:01 +0200) ---------------------------------------------------------------- Marek Vasut (4): COMMON: Add __stringify() function COMMON: Use __stringify() instead of xstr() COMMON: Use __stringify() instead of MK_STR() COMMON: Use __stringify() instead of rest of implementations arch/blackfin/include/asm/config-pre.h | 2 -- arch/blackfin/lib/board.c | 2 +- board/logicpd/zoom2/zoom2_serial.h | 7 +++---- board/w7o/w7o.c | 9 +------- common/cmd_nvedit.c | 5 +---- common/env_common.c | 34 ++++++++++++++---------------- common/env_embedded.c | 40 +++++++++++++++-------------------- include/common.h | 1 + include/configs/M52277EVB.h | 18 ++++++++-------- include/configs/M5253DEMO.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/M54451EVB.h | 10 ++++----- include/configs/M54455EVB.h | 16 +++++++------- include/configs/MERGERBOX.h | 24 ++++++++------------- include/configs/MPC8260ADS.h | 22 +++++++++---------- include/configs/MPC8308RDB.h | 9 +++----- include/configs/MPC8313ERDB.h | 21 +++++++++---------- include/configs/MPC8323ERDB.h | 21 +++++++++---------- include/configs/MPC8349ITX.h | 33 +++++++++++++++-------------- include/configs/MPC837XERDB.h | 21 +++++++++---------- include/configs/MPC8536DS.h | 35 ++++++++++++++++++------------- include/configs/MPC8544DS.h | 33 ++++++++++++++++------------- include/configs/MPC8548CDS.h | 17 +++++++++------ include/configs/MPC8572DS.h | 35 ++++++++++++++++++------------- include/configs/MPC8610HPCD.h | 93 +++++++++++++++++++++++++++++++++++++++++++-------------------------------------- include/configs/MPC8641HPCN.h | 17 +++++++++------ include/configs/MVBC_P.h | 38 ++++++++++++++------------------- include/configs/MVBLM7.h | 26 +++++++++++------------ include/configs/MVSMR.h | 30 +++++++++++--------------- include/configs/P1010RDB.h | 4 ++-- include/configs/P1022DS.h | 4 ++-- include/configs/P1_P2_RDB.h | 19 ++++++++++------- include/configs/P2020DS.h | 36 +++++++++++++++---------------- include/configs/P2041RDB.h | 6 +++--- include/configs/SIMPC8313.h | 21 +++++++++---------- include/configs/TQM85xx.h | 12 ++++++----- include/configs/amcc-common.h | 25 ++++++++++------------ include/configs/astro_mcf5373l.h | 7 +++---- include/configs/at91sam9263ek.h | 5 +---- include/configs/bf537-minotaur.h | 2 +- include/configs/bf537-srv1.h | 2 +- include/configs/bfin_adi_common.h | 13 ++++++------ include/configs/blackstamp.h | 10 ++++----- include/configs/blackvme.h | 6 +++--- include/configs/cam_enc_4xx.h | 36 +++++++++++++++---------------- include/configs/corenet_ds.h | 6 +++--- include/configs/ea20.h | 11 ++++------ include/configs/enbw_cmc.h | 19 +++++++---------- include/configs/flea3.h | 14 ++++++------- include/configs/ima3-mx53.h | 10 ++++----- include/configs/imx27lite-common.h | 15 ++++++------- include/configs/km/keymile-common.h | 13 +++++------- include/configs/km/km-powerpc.h | 12 +++++------ include/configs/km/km_arm.h | 14 ++++++------- include/configs/linkstation.h | 9 +++----- include/configs/lsxl.h | 4 ++-- include/configs/manroland/common.h | 21 ++++++++----------- include/configs/mcc200.h | 9 ++------ include/configs/mpc8308_p1m.h | 9 +++----- include/configs/mx35pdk.h | 14 ++++++------- include/configs/p1_p2_rdb_pc.h | 22 +++++++++---------- include/configs/qong.h | 9 +++----- include/configs/sbc8548.h | 26 +++++++++++------------ include/configs/tam3517-common.h | 11 ++++------ include/configs/tegra20-common.h | 12 +++-------- include/configs/tx25.h | 5 +---- include/configs/ve8313.h | 21 +++++++------------ include/configs/xpedite1000.h | 6 +++--- include/configs/xpedite517x.h | 12 +++++------ include/configs/xpedite520x.h | 12 +++++------ include/configs/xpedite537x.h | 12 +++++------ include/configs/xpedite550x.h | 12 +++++------ include/linux/stringify.h | 12 +++++++++++ include/nios2.h | 5 +++-- tools/env/fw_env.c | 37 +++++++++++++++----------------- 75 files changed, 583 insertions(+), 642 deletions(-) create mode 100644 include/linux/stringify.h

2 1

[U-Boot] [PATCH 0/3] EXYNOS: Add support for Exynos4x12
by Chander Kashyap 02 Oct '12

02 Oct '12

This patch series popultes Register addresses, clock structure and gpio structure for Exynos4x12. Chander Kashyap (3): EXYNOS: EXYNOS4X12: Populate Exynos4x12 register addresses EXYNOS: EXYNOS4X12: Add clock structure for EXYNOS4X12 EXYNOS: EXYNOS4X12: Add gpio structure for EXYNOS4X12 arch/arm/include/asm/arch-exynos/clock.h | 276 ++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-exynos/cpu.h | 48 +++++- arch/arm/include/asm/arch-exynos/gpio.h | 85 +++++++++ 3 files changed, 402 insertions(+), 7 deletions(-) -- 1.7.9.5

1 3

[U-Boot] [PATCH 00/16] pmic: Redesign PMIC framework to support multiple instances of devices
by Lukasz Majewski 02 Oct '12

02 Oct '12

PMIC framework has been redesigned to support multiple instances of power related devices (e.g. fuel gauge, PMICs, chargers, micro USB IC). Due to that, code at other architectures and boards have been adjusted properly. New power_board_init() method at ./lib/board.c file has been introduced. It is meant to be an architecture dependent function to support advanced power management. Since PMIC framework uses lists internally to link different devices, its initialization must be done just after malloc initialization. Please consider commits from this patch set as the example of advanced power management for a particular HW (Trats board in this case). In the new approach PMICs are selected with their names (e.g. 'pmic dump MAX8997_PMIC') Presented patch set is a first step to change 'pmic' command to more generic (i.e. power) to provide control for multiple devices. Dependencies: 1. gpio:fix: Proper handling of GPIO subsystem parts at Samsung devices http://patchwork.ozlabs.org/patch/181768/ 2. i2c:soft:multi: Support for multiple soft I2C buses at Samsung boards http://patchwork.ozlabs.org/patch/181789/ 3. i2c:soft:multi: Enable soft I2C multibus at Trats development board http://patchwork.ozlabs.org/patch/181788/ Test HW: - Exynos4210 Trats development board Lukasz Majewski (16): pmic:i2c: Handle PMIC I2C transmission comprising of two bytes pmic:i2c: Add I2C byte order to PMIC framework pmic:max8997: Switch the MAX8997 PMIC to be used with multibus I2C pmic: Extend PMIC framework to support multiple instances of PMIC devices pmic: Introduce power_board_init() method at ./lib/board.c file pmic: Enable power_board_init() support at TRATS pmic:chrg: Common information about charger and battery (power_chrg.h) pmic:muic: Support for MUIC built into MAX8997 device pmic:fuel-gauge: Support for MAX17042 fuel-gauge pmic:max8997: Function for calculating LDO internal register value arm:trats:pmic: Default PMIC(MAX8997) initialization for Samsung's TRATS board arm:trats:pmic: Enable MUIC (MAX8997) at Samsung's TRATS board arm:trats:pmic: Enable fuel-gauge (MAX17042) at Samsung's TRATS board pmic:max8997: Support for MAX8997 internal charger control arm:trats:pmic: Support for charging battery at Samsung's TRATS board arm:trats:pmic: Power consumption reduction state for Samsung's TRATS board arch/arm/lib/board.c | 4 + board/davedenx/qong/qong.c | 6 +- board/freescale/mx31pdk/mx31pdk.c | 6 +- board/freescale/mx35pdk/mx35pdk.c | 8 +- board/freescale/mx51evk/mx51evk.c | 6 +- board/freescale/mx53evk/mx53evk.c | 6 +- board/freescale/mx53loco/mx53loco.c | 10 +- board/hale/tt01/tt01.c | 6 +- board/samsung/goni/goni.c | 9 +- board/samsung/trats/trats.c | 259 ++++++++++++++++++++++++++++- board/samsung/universal_c210/universal.c | 10 +- board/ttcontrol/vision2/vision2.c | 6 +- drivers/misc/Makefile | 2 + drivers/misc/fg_max17042.c | 235 +++++++++++++++++++++++++++ drivers/misc/muic_max8997.c | 80 +++++++++ drivers/misc/pmic_core.c | 108 +++++++++---- drivers/misc/pmic_dialog.c | 8 +- drivers/misc/pmic_fsl.c | 8 +- drivers/misc/pmic_i2c.c | 40 ++++- drivers/misc/pmic_max8997.c | 80 +++++++++- drivers/misc/pmic_max8998.c | 10 +- drivers/misc/pmic_spi.c | 4 +- drivers/rtc/mc13xxx-rtc.c | 6 +- include/common.h | 3 + include/configs/trats.h | 7 + include/power/fg_battery_cell_params.h | 88 ++++++++++ include/power/max17042_fg.h | 74 +++++++++ include/power/max8997_muic.h | 61 +++++++ include/{ => power}/max8997_pmic.h | 27 +++- include/{ => power}/max8998_pmic.h | 0 include/{ => power}/pmic.h | 20 ++- include/power/power_chrg.h | 56 +++++++ 32 files changed, 1143 insertions(+), 110 deletions(-) create mode 100644 drivers/misc/fg_max17042.c create mode 100644 drivers/misc/muic_max8997.c create mode 100644 include/power/fg_battery_cell_params.h create mode 100644 include/power/max17042_fg.h create mode 100644 include/power/max8997_muic.h rename include/{ => power}/max8997_pmic.h (87%) rename include/{ => power}/max8998_pmic.h (100%) rename include/{ => power}/pmic.h (80%) create mode 100644 include/power/power_chrg.h -- 1.7.2.3

4 34

[U-Boot] Has anyone gotten the mmc commands to work on the NOVSOMTMi.MX6Q-SL-1-D, on the NOVPEK board by Novtech?
by Greg Topmiller 02 Oct '12

02 Oct '12

I am using release 2012.07 of u-boot with board type freescale/mx6qarm2. The mx6qarm2 is what is used as the board type in the freescale u-boot delivered with the board. We want to use the main line u-boot 2012.07. To get it working I had to change the serial port and it boots ok. I also noticed sdhc1 and sdhc2 were not being initialized with fsl_esdhc_initialize. I tried to initialize them but it hangs on "mmc rescan". I turned on CONFIG_MMC_TRACE and get the following. MX6QARM2 U-Boot > mmc rescan board_mmc_getcd called for FSL_SDHC MMC: mmc_set_bus_width MMC: mmc_set_clock MMC: mmc_go_idle CMD_SEND:0 ARG 0x00000000 FLAG 0 MMC_RSP_NONE MMC: mmc_send_if_cond CMD_SEND:8 ARG 0x000001AA FLAG 0 FYI, below is some debug output when sdhc1 and sdhc2 are not initialized and doing an mmc rescan. MX6QARM2 U-Boot > mmc rescan board_mmc_getcd called for FSL_SDHC MMC: mmc_set_bus_width MMC: mmc_set_clock MMC: mmc_go_idle CMD_SEND:0 ARG 0x00000000 FLAG 0 MMC_RSP_NONE MMC: mmc_send_if_cond CMD_SEND:8 ARG 0x000001AA FLAG 0 MMC_RSP_R1,5,6,7 0x4FD77E14 MMC: sd_send_op_cond CMD_SEND:55 ARG 0x00000000 FLAG 0 MMC_RSP_R1,5,6,7 0x00000002 MMC: sd_send_op_cond err -19 CMD_SEND:0 ARG 0x00000000 FLAG 0 MMC_RSP_NONE CMD_SEND:1 ARG 0x00000000 FLAG 0 MMC_RSP_R3,4 0x00000002 Card did not respond to voltage select! Any help is much appreciated. Thanks, Greg

3 3

[U-Boot] mmc Status Error: 0x01FBB4D0
by victor 02 Oct '12

02 Oct '12

Hi All. I change legacy sd/mmc driver to generic mmc structure, then I run the u-boot "mmc rescan" command. All looks fine except the: status reg 0x8c00 0x0 resp1_reg 0x0 Status Error: 0x01FBB4D8 Please help me on the meaning of the status error in mmc.c code. Thanks, Victor ================================================================================================ CONFIDENTIALITY NOTE: This e-mail and any attachments may contain confidential information and may be protected by legal privilege. If you are not the intended addressee (or authorized to receive for the addressee). be aware that any disclosure, copying, distribution or use of this e-mail or any attachment is prohibited. If you have received this e-mail in error, please notify us immediately by returning it to the sender and delete this copy from your system. Thank you for your cooperation. KeyASIC Inc. ================================================================================================

1 0

[U-Boot] include: fix mips64 build warning
by Zhi-zhou Zhang 02 Oct '12

02 Oct '12

fix warnings when building mips64, we define CONFIG_MIPS64 in config file. And this macro decides size_t. hashtable.c: In function 'hexport_r': hashtable.c:495:2: warning: format '%zu' expects argument of type 'size_t', but argument 5 has type 'unsigned int' [-Wformat] hashtable.c:554:5: warning: format '%zu' expects argument of type 'size_t', but argument 2 has type 'unsigned int' [-Wformat] hashtable.c:554:5: warning: format '%zu' expects argument of type 'size_t', but argument 3 has type 'unsigned int' [-Wformat] hashtable.c: In function 'himport_r': hashtable.c:654:3: warning: format '%zu' expects argument of type 'size_t', but argument 2 has type 'unsigned int' [-Wformat] Signed-off-by: Zhi-zhou Zhang <etou.zh(a)gmail.com> --- include/linux/types.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/types.h b/include/linux/types.h index 1b0b4a4..33ee095 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -4,6 +4,7 @@ #ifdef __KERNEL__ #include <linux/config.h> #endif +#include <config.h> #include <linux/posix_types.h> #include <asm/types.h> -- 1.7.9.5

2 3

[U-Boot] [PATCH] EXYNOS: Clock: Add common function for pll rate calculation
by Chander Kashyap 02 Oct '12

02 Oct '12

Moved the common code to calculate pll clock rate to new funtion exynos_get_pll_clk(). Signed-off-by: Chander Kashyap <chander.kashyap(a)linaro.org> --- arch/arm/cpu/armv7/exynos/clock.c | 102 ++++++++++++++----------------------- 1 file changed, 38 insertions(+), 64 deletions(-) diff --git a/arch/arm/cpu/armv7/exynos/clock.c b/arch/arm/cpu/armv7/exynos/clock.c index 4f3b451..a042423 100644 --- a/arch/arm/cpu/armv7/exynos/clock.c +++ b/arch/arm/cpu/armv7/exynos/clock.c @@ -26,41 +26,19 @@ #include <asm/arch/clock.h> #include <asm/arch/clk.h> -/* exynos4: return pll clock frequency */ -static unsigned long exynos4_get_pll_clk(int pllreg) +/* exynos: return pll clock frequency */ +static int exynos_get_pll_clk(int pllreg, unsigned int r, unsigned int k) { - struct exynos4_clock *clk = - (struct exynos4_clock *)samsung_get_base_clock(); - unsigned long r, m, p, s, k = 0, mask, fout; + unsigned long m, p, s = 0, mask, fout; unsigned int freq; - - switch (pllreg) { - case APLL: - r = readl(&clk->apll_con0); - break; - case MPLL: - r = readl(&clk->mpll_con0); - break; - case EPLL: - r = readl(&clk->epll_con0); - k = readl(&clk->epll_con1); - break; - case VPLL: - r = readl(&clk->vpll_con0); - k = readl(&clk->vpll_con1); - break; - default: - printf("Unsupported PLL (%d)\n", pllreg); - return 0; - } - /* * APLL_CON: MIDV [25:16] * MPLL_CON: MIDV [25:16] * EPLL_CON: MIDV [24:16] * VPLL_CON: MIDV [24:16] + * BPLL_CON: MIDV [25:16]: Exynos5 */ - if (pllreg == APLL || pllreg == MPLL) + if (pllreg == APLL || pllreg == MPLL || pllreg == BPLL) mask = 0x3ff; else mask = 0x1ff; @@ -92,13 +70,43 @@ static unsigned long exynos4_get_pll_clk(int pllreg) return fout; } +/* exynos4: return pll clock frequency */ +static unsigned long exynos4_get_pll_clk(int pllreg) +{ + struct exynos4_clock *clk = + (struct exynos4_clock *)samsung_get_base_clock(); + unsigned long r, k = 0; + + switch (pllreg) { + case APLL: + r = readl(&clk->apll_con0); + break; + case MPLL: + r = readl(&clk->mpll_con0); + break; + case EPLL: + r = readl(&clk->epll_con0); + k = readl(&clk->epll_con1); + break; + case VPLL: + r = readl(&clk->vpll_con0); + k = readl(&clk->vpll_con1); + break; + default: + printf("Unsupported PLL (%d)\n", pllreg); + return 0; + } + + return exynos_get_pll_clk(pllreg, r, k); +} + /* exynos5: return pll clock frequency */ static unsigned long exynos5_get_pll_clk(int pllreg) { struct exynos5_clock *clk = (struct exynos5_clock *)samsung_get_base_clock(); - unsigned long r, m, p, s, k = 0, mask, fout; - unsigned int freq, pll_div2_sel, fout_sel; + unsigned long r, k = 0, fout; + unsigned int pll_div2_sel, fout_sel; switch (pllreg) { case APLL: @@ -123,41 +131,7 @@ static unsigned long exynos5_get_pll_clk(int pllreg) return 0; } - /* - * APLL_CON: MIDV [25:16] - * MPLL_CON: MIDV [25:16] - * EPLL_CON: MIDV [24:16] - * VPLL_CON: MIDV [24:16] - * BPLL_CON: MIDV [25:16] - */ - if (pllreg == APLL || pllreg == MPLL || pllreg == BPLL) - mask = 0x3ff; - else - mask = 0x1ff; - - m = (r >> 16) & mask; - - /* PDIV [13:8] */ - p = (r >> 8) & 0x3f; - /* SDIV [2:0] */ - s = r & 0x7; - - freq = CONFIG_SYS_CLK_FREQ; - - if (pllreg == EPLL) { - k = k & 0xffff; - /* FOUT = (MDIV + K / 65536) * FIN / (PDIV * 2^SDIV) */ - fout = (m + k / 65536) * (freq / (p * (1 << s))); - } else if (pllreg == VPLL) { - k = k & 0xfff; - /* FOUT = (MDIV + K / 1024) * FIN / (PDIV * 2^SDIV) */ - fout = (m + k / 1024) * (freq / (p * (1 << s))); - } else { - if (s < 1) - s = 1; - /* FOUT = MDIV * FIN / (PDIV * 2^(SDIV - 1)) */ - fout = m * (freq / (p * (1 << (s - 1)))); - } + fout = exynos_get_pll_clk(pllreg, r, k); /* According to the user manual, in EVT1 MPLL and BPLL always gives * 1.6GHz clock, so divide by 2 to get 800MHz MPLL clock.*/ -- 1.7.9.5

1 0

[U-Boot] [PATCH] ARCH: EXYNOS: add support to match product id
by Chander Kashyap 02 Oct '12

02 Oct '12

From: Chander Kashyap <chander.kashyap(a)gmail.com> Based upon single SoC there can be multiple varients. This patch add support to match the complete product ID. Signed-off-by: Chander Kashyap <chander.kashyap(a)linaro.org> --- arch/arm/include/asm/arch-exynos/cpu.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h index 2cd4ae1..2bde10c 100644 --- a/arch/arm/include/asm/arch-exynos/cpu.h +++ b/arch/arm/include/asm/arch-exynos/cpu.h @@ -139,6 +139,15 @@ static inline int cpu_is_##type(void) \ IS_SAMSUNG_TYPE(exynos4, 0x4) IS_SAMSUNG_TYPE(exynos5, 0x5) +#define IS_EXYNOS_TYPE(type, id) \ +static inline int proid_is_##type(void) \ +{ \ + return s5p_cpu_id == id; \ +} + +IS_EXYNOS_TYPE(exynos4210, 0x4210) +IS_EXYNOS_TYPE(exynos5250, 0x5250) + #define SAMSUNG_BASE(device, base) \ static inline unsigned int samsung_get_base_##device(void) \ { \ -- 1.7.9.5

1 0

[U-Boot] [PATCH] pmc405de and zeus: remove the env_ptr externs
by Igor Grinberg 02 Oct '12

02 Oct '12

The env_ptr is already declared in environment.h, so there is no need to redeclare in board files (especially after including the environment.h) Remove those declarations. Signed-off-by: Igor Grinberg <grinberg(a)compulab.co.il> Cc: Stefan Roese <sr(a)denx.de> Cc: Matthias Fuchs <matthias.fuchs(a)esd-electronics.com> --- Stefan, Matthias, I'm sending from my laptop (not my main development machine) which does not have the ppc tool chain installed, can you please compile test these two boards? Thanks! board/esd/pmc405de/pmc405de.c | 1 - board/zeus/zeus.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/board/esd/pmc405de/pmc405de.c b/board/esd/pmc405de/pmc405de.c index a60809a..279d7d4 100644 --- a/board/esd/pmc405de/pmc405de.c +++ b/board/esd/pmc405de/pmc405de.c @@ -415,7 +415,6 @@ U_BOOT_CMD(eepwren, 2, 0, do_eep_wren, #if defined(CONFIG_PRAM) #include <environment.h> -extern env_t *env_ptr; int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c index 272e59b..e7b2f4d 100644 --- a/board/zeus/zeus.c +++ b/board/zeus/zeus.c @@ -39,7 +39,6 @@ DECLARE_GLOBAL_DATA_PTR; #define REBOOT_DO_POST 0x00000001 extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ -extern env_t *env_ptr; ulong flash_get_size(ulong base, int banknum); void env_crc_update(void); -- 1.7.3.4

3 2