March 2015 - U-Boot

[U-Boot] [PATCH v2] i2c: mvtwsi: Fix problem with baud rate calculation
by Stefan Roese 18 Mar '15

18 Mar '15

The current implementation for baudrate calculation is incorrect. This part from the formula: "2 ^ (n + 1)" is not equivalent to (1 << n) but to (2 << n)! This patch fixes this and moves this calculation to a function instead of using a macro. This new function is taken from the Linux kernel. This was detected and tested on the Marvell Armada A38x DB-88F6820-GP eval board. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Prafulla Wadaskar <prafulla(a)marvell.com> Cc: Luka Perkov <luka.perkov(a)sartura.hr> Cc: Hans de Goede <hdegoede(a)redhat.com> Cc: Ian Campbell <ijc(a)hellion.org.uk> Cc: Heiko Schocher <hs(a)denx.de> --- v2: - Still use the old formula for SUNXI, as this was checked by Hans with Allwinner to be the correct formula. This means that the Linux baudrate is incorrect for SUNXI I2C though. drivers/i2c/mvtwsi.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 9b2ca1e..6f6edd5 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -228,13 +228,14 @@ static int twsi_stop(int status) return status; } -/* - * Ugly formula to convert m and n values to a frequency comes from - * TWSI specifications - */ - -#define TWSI_FREQUENCY(m, n) \ - (CONFIG_SYS_TCLK / (10 * (m + 1) * (1 << n))) +static unsigned int twsi_calc_freq(const int n, const int m) +{ +#ifdef CONFIG_SUNXI + return CONFIG_SYS_TCLK / (10 * (m + 1) * (1 << n)); +#else + return CONFIG_SYS_TCLK / (10 * (m + 1) * (2 << n)); +#endif +} /* * Reset controller. @@ -266,7 +267,7 @@ static unsigned int twsi_i2c_set_bus_speed(struct i2c_adapter *adap, /* compute m, n setting for highest speed not above requested speed */ for (n = 0; n < 8; n++) { for (m = 0; m < 16; m++) { - tmp_speed = TWSI_FREQUENCY(m, n); + tmp_speed = twsi_calc_freq(n, m); if ((tmp_speed <= requested_speed) && (tmp_speed > highest_speed)) { highest_speed = tmp_speed; -- 2.3.3

3 2

[U-Boot] iMX6 IPU configuration by EDID
by Luca Ellero 18 Mar '15

18 Mar '15

Hi all, I'm trying to configure IPU on a iMX6 based platform by reading EDID from the external monitor. Everything seem to work fine except for the pixelclock. In particular my monitor has a standard resolution of 1280x1024@60 (108 MHz pixelclock). When the function ipu_init_sync_panel (file ipu_disp.c) is called it correctly receive 108 MHz as pixelclock. but during the execution of this function it gets rounded to 130 MHz. I can see that the function calls clk_round_rate to round the clock to 130 MHz but it's not clear for me how it works. Can someone please tell me how to get the exact pixelclock I would like to achieve? I've carefully read the iMX6 manual but it's not very useful in this case. Another doubt that I have regards the field "ext_clk" of parameter "ipu_di_signal_cfg_t sig". In this case, is it better to set it or not? Thanks Regards Luca -- Luca Ellero E-mail: luca.ellero(a)brickedbrain.com Internet: www.brickedbrain.com

2 2

[U-Boot] [PATCH] i2c: mvtwsi: Fix problem with baud rate calculation
by Stefan Roese 18 Mar '15

18 Mar '15

The current implementation for baudrate calculation is incorrect. This part from the formula: "2 ^ (n + 1)" is not equivalent to (1 << n) but to (2 << n)! This patch fixes this and moves this calculation to a function instead of using a macro. This new function is taken from the Linux kernel. This was detected and tested on the Marvell Armada A38x DB-88F6820-GP eval board. Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Prafulla Wadaskar <prafulla(a)marvell.com> Cc: Luka Perkov <luka.perkov(a)sartura.hr> Cc: Hans de Goede <hdegoede(a)redhat.com> Cc: Ian Campbell <ijc(a)hellion.org.uk> Cc: Heiko Schocher <hs(a)denx.de> --- drivers/i2c/mvtwsi.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c index 9b2ca1e..320235c 100644 --- a/drivers/i2c/mvtwsi.c +++ b/drivers/i2c/mvtwsi.c @@ -228,13 +228,10 @@ static int twsi_stop(int status) return status; } -/* - * Ugly formula to convert m and n values to a frequency comes from - * TWSI specifications - */ - -#define TWSI_FREQUENCY(m, n) \ - (CONFIG_SYS_TCLK / (10 * (m + 1) * (1 << n))) +static unsigned int twsi_calc_freq(const int n, const int m) +{ + return CONFIG_SYS_TCLK / (10 * (m + 1) * (2 << n)); +} /* * Reset controller. @@ -266,7 +263,7 @@ static unsigned int twsi_i2c_set_bus_speed(struct i2c_adapter *adap, /* compute m, n setting for highest speed not above requested speed */ for (n = 0; n < 8; n++) { for (m = 0; m < 16; m++) { - tmp_speed = TWSI_FREQUENCY(m, n); + tmp_speed = twsi_calc_freq(n, m); if ((tmp_speed <= requested_speed) && (tmp_speed > highest_speed)) { highest_speed = tmp_speed; -- 2.3.3

2 6

[U-Boot] Possible bug in sdhci.c
by Matt Reimer 18 Mar '15

18 Mar '15

In sdhci_init() a writel() is used on a byte-sized register, which would clobber the adjacent registers. Below is my suggested fix. If it looks correct, I can submit a proper patch. Matt diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index 82d7984..1f8917b 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -412,7 +412,7 @@ static int sdhci_init(struct mmc *mmc) if (host->quirks & SDHCI_QUIRK_NO_CD) { unsigned int status; - sdhci_writel(host, SDHCI_CTRL_CD_TEST_INS | SDHCI_CTRL_CD_TEST, + sdhci_writeb(host, SDHCI_CTRL_CD_TEST_INS | SDHCI_CTRL_CD_TEST, SDHCI_HOST_CONTROL); status = sdhci_readl(host, SDHCI_PRESENT_STATE);

2 5

[U-Boot] Possible bug in s5p_sdhci.c
by Matt Reimer 18 Mar '15

18 Mar '15

The use of SDHCI_CTRL2_SELBASECLK_SHIFT in s5p_sdhci_set_control_reg() seems wrong, because a shifting offset is being used as a mask, not to generate a mask. It's unclear what the original intent was. Below is my suggested fix. What think ye? Matt diff --git a/drivers/mmc/s5p_sdhci.c b/drivers/mmc/s5p_sdhci.c index 3899372..0eec731 100644 --- a/drivers/mmc/s5p_sdhci.c +++ b/drivers/mmc/s5p_sdhci.c @@ -30,7 +30,7 @@ static void s5p_sdhci_set_control_reg(struct sdhci_host *host) sdhci_writel(host, SDHCI_CTRL4_DRIVE_MASK(0x3), SDHCI_CONTROL4); val = sdhci_readl(host, SDHCI_CONTROL2); - val &= SDHCI_CTRL2_SELBASECLK_SHIFT; + val &= SDHCI_CTRL2_SELBASECLK_MASK(3); val |= SDHCI_CTRL2_ENSTAASYNCCLR | SDHCI_CTRL2_ENCMDCNFMSK |

3 5

[U-Boot] [PATCH V4] mpc85xx/T104xD4RDB: Add T104xD4RDB boards support
by Vijay Rai 18 Mar '15

18 Mar '15

T1040D4RDB is a Freescale reference board that hosts the T1040 SoC. T1040D4RDB is re-designed T1040RDB board with following changes : - Support of DDR4 memory - Support of 0x66 serdes protocol which can support following interfaces - 2 RGMII's on DTSEC4, DTSEC5 - 1 SGMII on DTSEC3 - Support of QE-TDM Similarily T1042D4RDB is a Freescale reference board that hosts the T1040 SoC. T1042D4RDB is re-designed T1042RDB board with following changes : - Support of DDR4 memory - Support for 0x86 serdes protocol which can support following interfaces - 2 RGMII's on DTSEC4, DTSEC5 - 3 SGMII on DTSEC1, DTSEC2 & DTSEC3 - Support of DIU Signed-off-by: Vijay Rai <vijay.rai(a)freescale.com> Signed-off-by: Priyanka Jain <Priyanka.Jain(a)freescale.com> --- changes from v2 : - removes checkpatch error board/freescale/t104xrdb/MAINTAINERS | 8 ++++++ board/freescale/t104xrdb/ddr.c | 6 ++++ board/freescale/t104xrdb/ddr.h | 13 ++++++++- board/freescale/t104xrdb/eth.c | 20 +++++++++++-- board/freescale/t104xrdb/t1040d4_rcw.cfg | 7 +++++ board/freescale/t104xrdb/t1042d4_rcw.cfg | 7 +++++ board/freescale/t104xrdb/t104xrdb.c | 17 +++++++++-- configs/T1040D4RDB_NAND_defconfig | 5 ++++ configs/T1040D4RDB_SDCARD_defconfig | 5 ++++ configs/T1040D4RDB_SPIFLASH_defconfig | 5 ++++ configs/T1040D4RDB_defconfig | 4 +++ configs/T1042D4RDB_NAND_defconfig | 5 ++++ configs/T1042D4RDB_SDCARD_defconfig | 5 ++++ configs/T1042D4RDB_SPIFLASH_defconfig | 5 ++++ configs/T1042D4RDB_defconfig | 4 +++ include/configs/T104xRDB.h | 46 ++++++++++++++++++++++++------ 16 files changed, 148 insertions(+), 14 deletions(-) create mode 100644 board/freescale/t104xrdb/t1040d4_rcw.cfg create mode 100644 board/freescale/t104xrdb/t1042d4_rcw.cfg create mode 100644 configs/T1040D4RDB_NAND_defconfig create mode 100644 configs/T1040D4RDB_SDCARD_defconfig create mode 100644 configs/T1040D4RDB_SPIFLASH_defconfig create mode 100644 configs/T1040D4RDB_defconfig create mode 100644 configs/T1042D4RDB_NAND_defconfig create mode 100644 configs/T1042D4RDB_SDCARD_defconfig create mode 100644 configs/T1042D4RDB_SPIFLASH_defconfig create mode 100644 configs/T1042D4RDB_defconfig diff --git a/board/freescale/t104xrdb/MAINTAINERS b/board/freescale/t104xrdb/MAINTAINERS index 13d9be9..32e044f 100644 --- a/board/freescale/t104xrdb/MAINTAINERS +++ b/board/freescale/t104xrdb/MAINTAINERS @@ -6,7 +6,13 @@ F: include/configs/T104xRDB.h F: configs/T1040RDB_defconfig F: configs/T1040RDB_NAND_defconfig F: configs/T1040RDB_SPIFLASH_defconfig +F: configs/T1040D4RDB_defconfig +F: configs/T1040D4RDB_NAND_defconfig +F: configs/T1040D4RDB_SPIFLASH_defconfig F: configs/T1042RDB_defconfig +F: configs/T1042D4RDB_defconfig +F: configs/T1042D4RDB_NAND_defconfig +F: configs/T1042D4RDB_SPIFLASH_defconfig F: configs/T1042RDB_PI_defconfig F: configs/T1042RDB_PI_NAND_defconfig F: configs/T1042RDB_PI_SPIFLASH_defconfig @@ -15,6 +21,8 @@ T1040RDB_SDCARD BOARD #M: - S: Maintained F: configs/T1040RDB_SDCARD_defconfig +F: configs/T1040D4RDB_SDCARD_defconfig +F: configs/T1042D4RDB_SDCARD_defconfig F: configs/T1042RDB_PI_SDCARD_defconfig T1040RDB_SECURE_BOOT BOARD diff --git a/board/freescale/t104xrdb/ddr.c b/board/freescale/t104xrdb/ddr.c index e1148e5..3c4eabf 100644 --- a/board/freescale/t104xrdb/ddr.c +++ b/board/freescale/t104xrdb/ddr.c @@ -91,8 +91,14 @@ found: popts->zq_en = 1; /* DHC_EN =1, ODT = 75 Ohm */ +#ifdef CONFIG_SYS_FSL_DDR4 + popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_80ohm); + popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_80ohm) | + DDR_CDR2_VREF_OVRD(70); /* Vref = 70% */ +#else popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_75ohm); popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_75ohm); +#endif } #if defined(CONFIG_DEEP_SLEEP) diff --git a/board/freescale/t104xrdb/ddr.h b/board/freescale/t104xrdb/ddr.h index ab1c32d..eb6ec70 100644 --- a/board/freescale/t104xrdb/ddr.h +++ b/board/freescale/t104xrdb/ddr.h @@ -28,6 +28,13 @@ static const struct board_specific_parameters udimm0[] = { * num| hi| rank| clk| wrlvl | wrlvl * ranks| mhz| GB |adjst| start | ctl2 */ +#ifdef CONFIG_SYS_FSL_DDR4 + {2, 1666, 0, 4, 7, 0x0808090B, 0x0C0D0E0A}, + {2, 1900, 0, 4, 6, 0x08080A0C, 0x0D0E0F0A}, + {1, 1666, 0, 4, 6, 0x0708090B, 0x0C0D0E09}, + {1, 1900, 0, 4, 6, 0x08080A0C, 0x0D0E0F0A}, + {1, 2200, 0, 4, 7, 0x08090A0D, 0x0F0F100C}, +#elif defined(CONFIG_SYS_FSL_DDR3) {2, 833, 4, 4, 6, 0x06060607, 0x08080807}, {2, 833, 0, 4, 6, 0x06060607, 0x08080807}, {2, 1350, 4, 4, 7, 0x0708080A, 0x0A0B0C09}, @@ -40,10 +47,14 @@ static const struct board_specific_parameters udimm0[] = { {1, 1350, 0, 4, 7, 0x0708080A, 0x0A0B0C09}, {1, 1666, 4, 4, 7, 0x0808090B, 0x0C0D0E0A}, {1, 1666, 0, 4, 7, 0x0808090B, 0x0C0D0E0A}, +#else +#error DDR type not defined +#endif {} }; +#endif + static const struct board_specific_parameters *udimms[] = { udimm0, }; -#endif diff --git a/board/freescale/t104xrdb/eth.c b/board/freescale/t104xrdb/eth.c index 7581a4cd..9c4e922 100644 --- a/board/freescale/t104xrdb/eth.c +++ b/board/freescale/t104xrdb/eth.c @@ -43,9 +43,11 @@ int board_eth_init(bd_t *bis) int idx = i - FM1_DTSEC1; switch (fm_info_get_enet_if(i)) { -#ifdef CONFIG_T1040RDB +#if defined(CONFIG_T1040RDB) || (CONFIG_T1040D4RDB) case PHY_INTERFACE_MODE_SGMII: - /* T1040RDB only supports SGMII on DTSEC3 */ + /* T1040RDB & T1040D4RDB only supports SGMII on + * DTSEC3 + */ fm_info_set_phy_address(FM1_DTSEC3, CONFIG_SYS_SGMII1_PHY_ADDR); break; @@ -60,6 +62,20 @@ int board_eth_init(bd_t *bis) CONFIG_SYS_SGMII1_PHY_ADDR); break; #endif +#ifdef CONFIG_T1042D4RDB + case PHY_INTERFACE_MODE_SGMII: + /* T1042D4RDB supports SGMII on DTSEC1, DTSEC2 + * & DTSEC3 + */ + if (FM1_DTSEC1 == i) + phy_addr = CONFIG_SYS_SGMII1_PHY_ADDR; + if (FM1_DTSEC2 == i) + phy_addr = CONFIG_SYS_SGMII2_PHY_ADDR; + if (FM1_DTSEC3 == i) + phy_addr = CONFIG_SYS_SGMII3_PHY_ADDR; + fm_info_set_phy_address(i, phy_addr); + break; +#endif case PHY_INTERFACE_MODE_RGMII: if (FM1_DTSEC4 == i) phy_addr = CONFIG_SYS_RGMII1_PHY_ADDR; diff --git a/board/freescale/t104xrdb/t1040d4_rcw.cfg b/board/freescale/t104xrdb/t1040d4_rcw.cfg new file mode 100644 index 0000000..3300c18 --- /dev/null +++ b/board/freescale/t104xrdb/t1040d4_rcw.cfg @@ -0,0 +1,7 @@ +#PBL preamble and RCW header +aa55aa55 010e0100 +# serdes protocol 0x66 +0c18000e 0e000000 00000000 00000000 +66000002 80000002 e8106000 01000000 +00000000 00000000 00000000 00032810 +00000000 0342500f 00000000 00000000 diff --git a/board/freescale/t104xrdb/t1042d4_rcw.cfg b/board/freescale/t104xrdb/t1042d4_rcw.cfg new file mode 100644 index 0000000..db4d52f --- /dev/null +++ b/board/freescale/t104xrdb/t1042d4_rcw.cfg @@ -0,0 +1,7 @@ +#PBL preamble and RCW header +aa55aa55 010e0100 +# serdes protocol 0x86 +0c18000e 0e000000 00000000 00000000 +86000002 80000002 ec027000 01000000 +00000000 00000000 00000000 00032810 +00000000 0342500f 00000000 00000000 diff --git a/board/freescale/t104xrdb/t104xrdb.c b/board/freescale/t104xrdb/t104xrdb.c index 9cd5e15..9d12942 100644 --- a/board/freescale/t104xrdb/t104xrdb.c +++ b/board/freescale/t104xrdb/t104xrdb.c @@ -27,6 +27,10 @@ int checkboard(void) { struct cpu_type *cpu = gd->arch.cpu; u8 sw; + ccsr_gur_t __iomem *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); + u32 srds_s1; + + srds_s1 = in_be32(&gur->rcwsr[4]) >> 24; printf("Board: %sRDB\n", cpu->name); printf("Board rev: 0x%02x CPLD ver: 0x%02x, ", @@ -40,6 +44,16 @@ int checkboard(void) else printf("Unsupported Bank=%x\n", sw); + printf("SERDES Reference : 0x%X\n", srds_s1); + + if (srds_s1 == 0x86) + /* choose SGMII */ + CPLD_WRITE(misc_ctl_status, CPLD_READ(misc_ctl_status) | 0x80); + + if (srds_s1 == 0x8E) + /* choose SGMII & Aurora */ + CPLD_WRITE(misc_ctl_status, CPLD_READ(misc_ctl_status) | 0x82); + return 0; } @@ -49,8 +63,7 @@ int board_early_init_f(void) if (is_warm_boot()) fsl_dp_disable_console(); #endif - - return 0; +return 0; } int board_early_init_r(void) diff --git a/configs/T1040D4RDB_NAND_defconfig b/configs/T1040D4RDB_NAND_defconfig new file mode 100644 index 0000000..72b046b --- /dev/null +++ b/configs/T1040D4RDB_NAND_defconfig @@ -0,0 +1,5 @@ +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB" ++S:CONFIG_PPC=y ++S:CONFIG_MPC85xx=y ++S:CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1040D4RDB_SDCARD_defconfig b/configs/T1040D4RDB_SDCARD_defconfig new file mode 100644 index 0000000..9e63214 --- /dev/null +++ b/configs/T1040D4RDB_SDCARD_defconfig @@ -0,0 +1,5 @@ +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB" ++S:CONFIG_PPC=y ++S:CONFIG_MPC85xx=y ++S:CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1040D4RDB_SPIFLASH_defconfig b/configs/T1040D4RDB_SPIFLASH_defconfig new file mode 100644 index 0000000..e0ab015 --- /dev/null +++ b/configs/T1040D4RDB_SPIFLASH_defconfig @@ -0,0 +1,5 @@ +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB" ++S:CONFIG_PPC=y ++S:CONFIG_MPC85xx=y ++S:CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1040D4RDB_defconfig b/configs/T1040D4RDB_defconfig new file mode 100644 index 0000000..d650ab6 --- /dev/null +++ b/configs/T1040D4RDB_defconfig @@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="PPC_T1040,T1040D4RDB,T104XD4RDB" +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1042D4RDB_NAND_defconfig b/configs/T1042D4RDB_NAND_defconfig new file mode 100644 index 0000000..5e33654 --- /dev/null +++ b/configs/T1042D4RDB_NAND_defconfig @@ -0,0 +1,5 @@ +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,NAND,T104XD4RDB" ++S:CONFIG_PPC=y ++S:CONFIG_MPC85xx=y ++S:CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1042D4RDB_SDCARD_defconfig b/configs/T1042D4RDB_SDCARD_defconfig new file mode 100644 index 0000000..7851a8b --- /dev/null +++ b/configs/T1042D4RDB_SDCARD_defconfig @@ -0,0 +1,5 @@ +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SDCARD,T104XD4RDB" ++S:CONFIG_PPC=y ++S:CONFIG_MPC85xx=y ++S:CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1042D4RDB_SPIFLASH_defconfig b/configs/T1042D4RDB_SPIFLASH_defconfig new file mode 100644 index 0000000..536ea79 --- /dev/null +++ b/configs/T1042D4RDB_SPIFLASH_defconfig @@ -0,0 +1,5 @@ +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,RAMBOOT_PBL,SPL_FSL_PBL,SPIFLASH,T104XD4RDB" ++S:CONFIG_PPC=y ++S:CONFIG_MPC85xx=y ++S:CONFIG_TARGET_T104XRDB=y diff --git a/configs/T1042D4RDB_defconfig b/configs/T1042D4RDB_defconfig new file mode 100644 index 0000000..715697f --- /dev/null +++ b/configs/T1042D4RDB_defconfig @@ -0,0 +1,4 @@ +CONFIG_SYS_EXTRA_OPTIONS="PPC_T1042,T1042D4RDB,T104XD4RDB" +CONFIG_PPC=y +CONFIG_MPC85xx=y +CONFIG_TARGET_T104XRDB=y diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index 5263318..111bbfb 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -29,6 +29,14 @@ #ifdef CONFIG_T1042RDB #define CONFIG_SYS_FSL_PBL_RCW $(SRCTREE)/board/freescale/t104xrdb/t1042_rcw.cfg #endif +#ifdef CONFIG_T1040D4RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1040d4_rcw.cfg +#endif +#ifdef CONFIG_T1042D4RDB +#define CONFIG_SYS_FSL_PBL_RCW \ +$(SRCTREE)/board/freescale/t104xrdb/t1042d4_rcw.cfg +#endif #define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT #define CONFIG_SPL_ENV_SUPPORT @@ -219,8 +227,14 @@ #define CONFIG_DIMM_SLOTS_PER_CTLR 1 #define CONFIG_CHIP_SELECTS_PER_CTRL (2 * CONFIG_DIMM_SLOTS_PER_CTLR) +#ifdef CONFIG_T104XD4RDB +#define CONFIG_SYS_FSL_DDR4 +#endif + #define CONFIG_DDR_SPD +#ifndef CONFIG_SYS_FSL_DDR4 #define CONFIG_SYS_FSL_DDR3 +#endif #define CONFIG_SYS_SPD_BUS_NUM 0 #define SPD_EEPROM_ADDRESS 0x51 @@ -278,7 +292,7 @@ #define CPLD_LBMAP_DFLTBANK 0x40 /* BANK OR | BANK0 */ #define CPLD_LBMAP_RESET 0xFF #define CPLD_LBMAP_SHIFT 0x03 -#ifdef CONFIG_T1042RDB_PI +#if defined(CONFIG_T1042RDB_PI) || defined(CONFIG_T104XD4RDB) #define CPLD_DIU_SEL_DFP 0x80 #endif @@ -448,7 +462,7 @@ #define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#ifdef CONFIG_T1042RDB_PI +#if defined(CONFIG_T1042RDB_PI) || defined(CONFIG_T104XD4RDB) /* Video */ #define CONFIG_FSL_DIU_FB @@ -493,11 +507,11 @@ /* I2C bus multiplexer */ #define I2C_MUX_PCA_ADDR 0x70 -#if defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB) +#if defined(CONFIG_T104xRDB) || defined(CONFIG_T104XD4RDB) #define I2C_MUX_CH_DEFAULT 0x8 #endif -#ifdef CONFIG_T1042RDB_PI +#if defined(CONFIG_T1042RDB_PI) || defined(CONFIG_T104XD4RDB) /* LDI/DVI Encoder for display */ #define CONFIG_SYS_I2C_LDI_ADDR 0x38 #define CONFIG_SYS_I2C_DVI_ADDR 0x75 @@ -666,7 +680,7 @@ #define CONFIG_SYS_DPAA_FMAN #define CONFIG_SYS_DPAA_PME -#if defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB) +#if defined(CONFIG_T104xRDB) || defined(CONFIG_T104XD4RDB) #define CONFIG_QE #define CONFIG_U_QE #endif @@ -695,7 +709,7 @@ #define CONFIG_SYS_FMAN_FW_ADDR 0xEFF00000 #endif -#if defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB) +#if defined(CONFIG_T104xRDB) || defined(CONFIG_T104XD4RDB) #if defined(CONFIG_SPIFLASH) #define CONFIG_SYS_QE_FW_ADDR 0x130000 #elif defined(CONFIG_SDCARD) @@ -720,10 +734,20 @@ #ifdef CONFIG_FMAN_ENET #if defined(CONFIG_T1040RDB) || defined(CONFIG_T1042RDB) -#define CONFIG_SYS_SGMII1_PHY_ADDR 0x03 +#define CONFIG_SYS_SGMII1_PHY_ADDR 0x03 +#elif defined(CONFIG_T1040D4RDB) || defined(CONFIG_T1042D4RDB) +#define CONFIG_SYS_SGMII1_PHY_ADDR 0x02 +#define CONFIG_SYS_SGMII2_PHY_ADDR 0x03 +#define CONFIG_SYS_SGMII3_PHY_ADDR 0x01 +#endif + +#ifdef CONFIG_T104XD4RDB +#define CONFIG_SYS_RGMII1_PHY_ADDR 0x04 +#define CONFIG_SYS_RGMII2_PHY_ADDR 0x05 +#else +#define CONFIG_SYS_RGMII1_PHY_ADDR 0x01 +#define CONFIG_SYS_RGMII2_PHY_ADDR 0x02 #endif -#define CONFIG_SYS_RGMII1_PHY_ADDR 0x01 -#define CONFIG_SYS_RGMII2_PHY_ADDR 0x02 /* Enable VSC9953 L2 Switch driver on T1040 SoC */ #ifdef CONFIG_T1040RDB @@ -842,6 +866,10 @@ #define FDTFILE "t1042rdb_pi/t1042rdb_pi.dtb" #elif defined(CONFIG_T1042RDB) #define FDTFILE "t1042rdb/t1042rdb.dtb" +#elif defined(CONFIG_T1040D4RDB) +#define FDTFILE "t1042rdb/t1040d4rdb.dtb" +#elif defined(CONFIG_T1042D4RDB) +#define FDTFILE "t1042rdb/t1042d4rdb.dtb" #endif #ifdef CONFIG_FSL_DIU_FB -- 1.7.9.5

2 1

[U-Boot] [PATCH] travis.yml: add more targets to build on travis
by Heiko Schocher 17 Mar '15

17 Mar '15

- add more targets for building with buildman: - avr32 - m68k and while at it, sort the list alphabetical Signed-off-by: Heiko Schocher <hs(a)denx.de> --- m68k build fails with: Building current source for 48 boards (32 threads, 1 job per thread) m68k: +M53017EVB +(M53017EVB) arch/m68k/cpu/mcf532x/start.o: In function `_start': +(M53017EVB) arch/m68k/cpu/mcf532x/start.S:159:(.text+0x462): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o +(M53017EVB) make[1]: *** [u-boot] Error 1 +(M53017EVB) make: *** [sub-make] Error 2 m68k: +eb_cpu5282_internal +(eb_cpu5282_internal) common/built-in.o: In function `reserve_video': +(eb_cpu5282_internal) common/board_f.c:500: undefined reference to `video_setmem' +(eb_cpu5282_internal) make[1]: *** [u-boot] Error 1 +(eb_cpu5282_internal) make: *** [sub-make] Error 2 m68k: +eb_cpu5282 +(eb_cpu5282) common/built-in.o: In function `reserve_video': +(eb_cpu5282) common/board_f.c:500: undefined reference to `video_setmem' +(eb_cpu5282) make[1]: *** [u-boot] Error 1 +(eb_cpu5282) make: *** [sub-make] Error 2 4503/48 0:00:01 : M5485DFE @Alison, @Angelo: Could you look into this issue? .travis.yml | 64 +++++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1d5c18a..4e20e09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,14 +42,16 @@ env: before_script: # install toolchains based on INSTALL_TOOLCHAIN} variable - - if [[ "${INSTALL_TOOLCHAIN}" == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *mips* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/mips/eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh ; fi - - if [[ "${INSTALL_TOOLCHAIN}" == *mips* ]]; then sh eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh -y ; fi - if [[ "${INSTALL_TOOLCHAIN}" == *arm* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/armv5te/eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh ; fi - if [[ "${INSTALL_TOOLCHAIN}" == *arm* ]]; then sh eldk-eglibc-i686-arm-toolchain-gmae-5.4.sh -y ; fi - if [[ "${INSTALL_TOOLCHAIN}" == *arm* ]]; then ls -al /opt/eldk-5.4/armv5te/sysroots/i686-eldk-linux/usr/bin/armv5te-linux-gnueabi ; fi + - if [[ "${INSTALL_TOOLCHAIN}" == *avr32* ]]; then ./tools/buildman/buildman --fetch-arch avr32 ; fi - if [[ "${INSTALL_TOOLCHAIN}" == *i386* ]]; then ./tools/buildman/buildman sandbox --fetch-arch i386 ; fi + - if [[ "${INSTALL_TOOLCHAIN}" == *m68k* ]]; then ./tools/buildman/buildman --fetch-arch m68k ; fi + - if [[ "${INSTALL_TOOLCHAIN}" == *mips* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/mips/eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh ; fi + - if [[ "${INSTALL_TOOLCHAIN}" == *mips* ]]; then sh eldk-eglibc-i686-mips-toolchain-gmae-5.4.sh -y ; fi + - if [[ "${INSTALL_TOOLCHAIN}" == *ppc* ]]; then wget ftp://ftp.denx.de/pub/eldk/5.4/targets/powerpc/eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh ; fi + - if [[ "${INSTALL_TOOLCHAIN}" == *ppc* ]]; then sh eldk-eglibc-i686-powerpc-toolchain-gmae-5.4.sh -y ; fi script: # the execution sequence for each test @@ -98,63 +100,67 @@ matrix: CROSS_COMPILE="/opt/eldk-5.4/mips/sysroots/i686-eldk-linux/usr/bin/mips32-linux/mips-linux-" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards atmel -x avr32" + TEST_CMD="tools/buildman/buildman --list-error-boards arm1136" INSTALL_TOOLCHAIN="arm" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards denx" + TEST_CMD="tools/buildman/buildman --list-error-boards arm1176" INSTALL_TOOLCHAIN="arm" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards freescale -x powerpc,m68k,aarch64" + TEST_CMD="tools/buildman/buildman --list-error-boards arm720t" INSTALL_TOOLCHAIN="arm" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards freescale -x arm,m68k,aarch64" - INSTALL_TOOLCHAIN="ppc" + TEST_CMD="tools/buildman/buildman --list-error-boards arm920t" + INSTALL_TOOLCHAIN="arm" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards siemens" + TEST_CMD="tools/buildman/buildman --list-error-boards atmel -x avr32" INSTALL_TOOLCHAIN="arm" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards ti" - INSTALL_TOOLCHAIN="arm" + TEST_CMD="tools/buildman/buildman --list-error-boards avr32" + INSTALL_TOOLCHAIN="avr32" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards arm1136" + TEST_CMD="tools/buildman/buildman --list-error-boards davinci" INSTALL_TOOLCHAIN="arm" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards arm1176" + TEST_CMD="tools/buildman/buildman --list-error-boards denx" INSTALL_TOOLCHAIN="arm" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards arm720t" + TEST_CMD="tools/buildman/buildman --list-error-boards freescale -x powerpc,m68k,aarch64" INSTALL_TOOLCHAIN="arm" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards arm920t" - INSTALL_TOOLCHAIN="arm" + TEST_CMD="tools/buildman/buildman --list-error-boards freescale -x arm,m68k,aarch64" + INSTALL_TOOLCHAIN="ppc" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards davinci" - INSTALL_TOOLCHAIN="arm" + TEST_CMD="tools/buildman/buildman --list-error-boards sandbox x86" + INSTALL_TOOLCHAIN="i386" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" TEST_CMD="tools/buildman/buildman --list-error-boards kirkwood" INSTALL_TOOLCHAIN="arm" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" + TEST_CMD="tools/buildman/buildman --list-error-boards m68k" + INSTALL_TOOLCHAIN="m68k" + - env: + - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" TEST_CMD="tools/buildman/buildman mips" INSTALL_TOOLCHAIN="mips" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc5xx" + TEST_CMD="tools/buildman/buildman mpc512x" INSTALL_TOOLCHAIN="ppc" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc8xx" + TEST_CMD="tools/buildman/buildman mpc5xx" INSTALL_TOOLCHAIN="ppc" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" @@ -162,10 +168,6 @@ matrix: INSTALL_TOOLCHAIN="ppc" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman mpc512x" - INSTALL_TOOLCHAIN="ppc" - - env: - - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" TEST_CMD="tools/buildman/buildman mpc8260" INSTALL_TOOLCHAIN="ppc" - env: @@ -182,8 +184,16 @@ matrix: INSTALL_TOOLCHAIN="ppc" - env: - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" - TEST_CMD="tools/buildman/buildman --list-error-boards sandbox x86" - INSTALL_TOOLCHAIN="i386" + TEST_CMD="tools/buildman/buildman mpc8xx" + INSTALL_TOOLCHAIN="ppc" + - env: + - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" + TEST_CMD="tools/buildman/buildman --list-error-boards siemens" + INSTALL_TOOLCHAIN="arm" + - env: + - TEST_CONFIG_CMD="tools/buildman/buildman --list-tool-chains" + TEST_CMD="tools/buildman/buildman --list-error-boards ti" + INSTALL_TOOLCHAIN="arm" # QA jobs for code analytics # static code analysis with cppcheck (we can add --enable=all later) -- 2.1.0

3 2

[U-Boot] [PATCH 0/7] powerpc: drop some non-generic boards
by Masahiro Yamada 17 Mar '15

17 Mar '15

There are still many non-generic boards (=unmaintained boards) remaining. This series removes some of them. If somebody wants to keep them, please speak up! (I am CCing the board maintainers.) Masahiro Yamada (7): powerpc: mpc5xxx: remove BC3450 board support powerpc: ppc4xx: remove JSE board support powerpc: mpc5xxx: remove aev, TB5200 board support powerpc: ppc4xx: remove W7OLMC/W7OLMG board support powerpc: mpc5xxx: remove galaxy5200 board support powerpc: ppc4xx: remove korat board support powerpc: mpc83xx: remove non-generic freescale boards arch/powerpc/cpu/mpc5xxx/Kconfig | 14 - arch/powerpc/cpu/mpc83xx/Kconfig | 33 -- arch/powerpc/cpu/ppc4xx/Kconfig | 15 - board/bc3450/Kconfig | 9 - board/bc3450/MAINTAINERS | 6 - board/bc3450/Makefile | 8 - board/bc3450/bc3450.c | 586 ------------------- board/bc3450/cmd_bc3450.c | 805 -------------------------- board/bc3450/mt48lc16m16a2-75.h | 18 - board/freescale/common/pq-mds-pib.c | 26 - board/freescale/mpc8308rdb/Kconfig | 12 - board/freescale/mpc8308rdb/MAINTAINERS | 6 - board/freescale/mpc8308rdb/Makefile | 10 - board/freescale/mpc8308rdb/mpc8308rdb.c | 192 ------- board/freescale/mpc8308rdb/sdram.c | 81 --- board/freescale/mpc8313erdb/Kconfig | 12 - board/freescale/mpc8313erdb/MAINTAINERS | 9 - board/freescale/mpc8313erdb/Makefile | 8 - board/freescale/mpc8313erdb/README | 111 ---- board/freescale/mpc8313erdb/mpc8313erdb.c | 157 ----- board/freescale/mpc8313erdb/sdram.c | 124 ---- board/freescale/mpc8315erdb/Kconfig | 12 - board/freescale/mpc8315erdb/MAINTAINERS | 6 - board/freescale/mpc8315erdb/Makefile | 8 - board/freescale/mpc8315erdb/README | 105 ---- board/freescale/mpc8315erdb/mpc8315erdb.c | 246 -------- board/freescale/mpc8315erdb/sdram.c | 111 ---- board/freescale/mpc8323erdb/Kconfig | 12 - board/freescale/mpc8323erdb/MAINTAINERS | 6 - board/freescale/mpc8323erdb/Makefile | 8 - board/freescale/mpc8323erdb/README | 71 --- board/freescale/mpc8323erdb/mpc8323erdb.c | 222 ------- board/freescale/mpc832xemds/Kconfig | 12 - board/freescale/mpc832xemds/MAINTAINERS | 10 - board/freescale/mpc832xemds/Makefile | 9 - board/freescale/mpc832xemds/README | 128 ----- board/freescale/mpc832xemds/mpc832xemds.c | 166 ------ board/freescale/mpc832xemds/pci.c | 146 ----- board/freescale/mpc8349emds/Kconfig | 12 - board/freescale/mpc8349emds/MAINTAINERS | 6 - board/freescale/mpc8349emds/Makefile | 10 - board/freescale/mpc8349emds/ddr.c | 101 ---- board/freescale/mpc8349emds/mpc8349emds.c | 285 --------- board/freescale/mpc8349emds/pci.c | 192 ------- board/freescale/mpc8349itx/Kconfig | 12 - board/freescale/mpc8349itx/MAINTAINERS | 8 - board/freescale/mpc8349itx/Makefile | 8 - board/freescale/mpc8349itx/README | 187 ------ board/freescale/mpc8349itx/mpc8349itx.c | 390 ------------- board/freescale/mpc8349itx/pci.c | 105 ---- board/freescale/mpc837xemds/Kconfig | 12 - board/freescale/mpc837xemds/MAINTAINERS | 7 - board/freescale/mpc837xemds/Makefile | 9 - board/freescale/mpc837xemds/README | 104 ---- board/freescale/mpc837xemds/mpc837xemds.c | 346 ----------- board/freescale/mpc837xemds/pci.c | 147 ----- board/freescale/mpc837xemds/pci.h | 6 - board/galaxy5200/Kconfig | 9 - board/galaxy5200/MAINTAINERS | 7 - board/galaxy5200/Makefile | 8 - board/galaxy5200/galaxy5200.c | 185 ------ board/jse/Kconfig | 9 - board/jse/MAINTAINERS | 6 - board/jse/Makefile | 12 - board/jse/README.txt | 48 -- board/jse/flash.c | 491 ---------------- board/jse/host_bridge.c | 77 --- board/jse/init.S | 75 --- board/jse/jse.c | 147 ----- board/jse/jse_priv.h | 12 - board/jse/sdram.c | 169 ------ board/korat/Kconfig | 9 - board/korat/MAINTAINERS | 7 - board/korat/Makefile | 9 - board/korat/README | 64 --- board/korat/config.mk | 27 - board/korat/init.S | 80 --- board/korat/korat.c | 633 -------------------- board/korat/u-boot-F7FC.lds | 124 ---- board/tqc/tqm5200/Kconfig | 26 - board/tqc/tqm5200/MAINTAINERS | 3 - board/tqc/tqm5200/Makefile | 2 +- board/tqc/tqm5200/cmd_tb5200.c | 88 --- board/tqc/tqm5200/tqm5200.c | 12 +- board/w7o/Kconfig | 19 - board/w7o/MAINTAINERS | 8 - board/w7o/Makefile | 13 - board/w7o/cmd_vpd.c | 48 -- board/w7o/errors.h | 81 --- board/w7o/flash.c | 927 ------------------------------ board/w7o/fpga.c | 371 ------------ board/w7o/fsboot.c | 73 --- board/w7o/init.S | 244 -------- board/w7o/post1.S | 724 ----------------------- board/w7o/post2.c | 98 ---- board/w7o/u-boot.lds.debug | 121 ---- board/w7o/vpd.c | 412 ------------- board/w7o/vpd.h | 118 ---- board/w7o/w7o.c | 257 --------- board/w7o/w7o.h | 73 --- board/w7o/watchdog.c | 31 - configs/BC3450_defconfig | 3 - configs/JSE_defconfig | 3 - configs/MPC8308RDB_defconfig | 3 - configs/MPC8313ERDB_33_defconfig | 4 - configs/MPC8313ERDB_66_defconfig | 4 - configs/MPC8313ERDB_NAND_33_defconfig | 5 - configs/MPC8313ERDB_NAND_66_defconfig | 5 - configs/MPC8315ERDB_defconfig | 3 - configs/MPC8323ERDB_defconfig | 3 - configs/MPC832XEMDS_ATM_defconfig | 4 - configs/MPC832XEMDS_HOST_33_defconfig | 4 - configs/MPC832XEMDS_HOST_66_defconfig | 4 - configs/MPC832XEMDS_SLAVE_defconfig | 4 - configs/MPC832XEMDS_defconfig | 3 - configs/MPC8349EMDS_defconfig | 3 - configs/MPC8349ITXGP_defconfig | 4 - configs/MPC8349ITX_LOWBOOT_defconfig | 4 - configs/MPC8349ITX_defconfig | 4 - configs/MPC837XEMDS_HOST_defconfig | 4 - configs/MPC837XEMDS_defconfig | 3 - configs/TB5200_B_defconfig | 4 - configs/TB5200_defconfig | 3 - configs/W7OLMC_defconfig | 3 - configs/W7OLMG_defconfig | 3 - configs/aev_defconfig | 3 - configs/galaxy5200_LOWBOOT_defconfig | 4 - configs/galaxy5200_defconfig | 4 - configs/korat_defconfig | 3 - configs/korat_perm_defconfig | 4 - doc/README.scrapyard | 30 +- include/configs/BC3450.h | 541 ----------------- include/configs/JSE.h | 276 --------- include/configs/MPC8308RDB.h | 582 ------------------- include/configs/MPC8313ERDB.h | 719 ----------------------- include/configs/MPC8315ERDB.h | 659 --------------------- include/configs/MPC8323ERDB.h | 555 ------------------ include/configs/MPC832XEMDS.h | 624 -------------------- include/configs/MPC8349EMDS.h | 810 -------------------------- include/configs/MPC8349ITX.h | 806 -------------------------- include/configs/MPC837XEMDS.h | 719 ----------------------- include/configs/TB5200.h | 496 ---------------- include/configs/W7OLMC.h | 314 ---------- include/configs/W7OLMG.h | 317 ---------- include/configs/aev.h | 390 ------------- include/configs/galaxy5200.h | 431 -------------- include/configs/korat.h | 550 ------------------ 147 files changed, 25 insertions(+), 20323 deletions(-) delete mode 100644 board/bc3450/Kconfig delete mode 100644 board/bc3450/MAINTAINERS delete mode 100644 board/bc3450/Makefile delete mode 100644 board/bc3450/bc3450.c delete mode 100644 board/bc3450/cmd_bc3450.c delete mode 100644 board/bc3450/mt48lc16m16a2-75.h delete mode 100644 board/freescale/mpc8308rdb/Kconfig delete mode 100644 board/freescale/mpc8308rdb/MAINTAINERS delete mode 100644 board/freescale/mpc8308rdb/Makefile delete mode 100644 board/freescale/mpc8308rdb/mpc8308rdb.c delete mode 100644 board/freescale/mpc8308rdb/sdram.c delete mode 100644 board/freescale/mpc8313erdb/Kconfig delete mode 100644 board/freescale/mpc8313erdb/MAINTAINERS delete mode 100644 board/freescale/mpc8313erdb/Makefile delete mode 100644 board/freescale/mpc8313erdb/README delete mode 100644 board/freescale/mpc8313erdb/mpc8313erdb.c delete mode 100644 board/freescale/mpc8313erdb/sdram.c delete mode 100644 board/freescale/mpc8315erdb/Kconfig delete mode 100644 board/freescale/mpc8315erdb/MAINTAINERS delete mode 100644 board/freescale/mpc8315erdb/Makefile delete mode 100644 board/freescale/mpc8315erdb/README delete mode 100644 board/freescale/mpc8315erdb/mpc8315erdb.c delete mode 100644 board/freescale/mpc8315erdb/sdram.c delete mode 100644 board/freescale/mpc8323erdb/Kconfig delete mode 100644 board/freescale/mpc8323erdb/MAINTAINERS delete mode 100644 board/freescale/mpc8323erdb/Makefile delete mode 100644 board/freescale/mpc8323erdb/README delete mode 100644 board/freescale/mpc8323erdb/mpc8323erdb.c delete mode 100644 board/freescale/mpc832xemds/Kconfig delete mode 100644 board/freescale/mpc832xemds/MAINTAINERS delete mode 100644 board/freescale/mpc832xemds/Makefile delete mode 100644 board/freescale/mpc832xemds/README delete mode 100644 board/freescale/mpc832xemds/mpc832xemds.c delete mode 100644 board/freescale/mpc832xemds/pci.c delete mode 100644 board/freescale/mpc8349emds/Kconfig delete mode 100644 board/freescale/mpc8349emds/MAINTAINERS delete mode 100644 board/freescale/mpc8349emds/Makefile delete mode 100644 board/freescale/mpc8349emds/ddr.c delete mode 100644 board/freescale/mpc8349emds/mpc8349emds.c delete mode 100644 board/freescale/mpc8349emds/pci.c delete mode 100644 board/freescale/mpc8349itx/Kconfig delete mode 100644 board/freescale/mpc8349itx/MAINTAINERS delete mode 100644 board/freescale/mpc8349itx/Makefile delete mode 100644 board/freescale/mpc8349itx/README delete mode 100644 board/freescale/mpc8349itx/mpc8349itx.c delete mode 100644 board/freescale/mpc8349itx/pci.c delete mode 100644 board/freescale/mpc837xemds/Kconfig delete mode 100644 board/freescale/mpc837xemds/MAINTAINERS delete mode 100644 board/freescale/mpc837xemds/Makefile delete mode 100644 board/freescale/mpc837xemds/README delete mode 100644 board/freescale/mpc837xemds/mpc837xemds.c delete mode 100644 board/freescale/mpc837xemds/pci.c delete mode 100644 board/freescale/mpc837xemds/pci.h delete mode 100644 board/galaxy5200/Kconfig delete mode 100644 board/galaxy5200/MAINTAINERS delete mode 100644 board/galaxy5200/Makefile delete mode 100644 board/galaxy5200/galaxy5200.c delete mode 100644 board/jse/Kconfig delete mode 100644 board/jse/MAINTAINERS delete mode 100644 board/jse/Makefile delete mode 100644 board/jse/README.txt delete mode 100644 board/jse/flash.c delete mode 100644 board/jse/host_bridge.c delete mode 100644 board/jse/init.S delete mode 100644 board/jse/jse.c delete mode 100644 board/jse/jse_priv.h delete mode 100644 board/jse/sdram.c delete mode 100644 board/korat/Kconfig delete mode 100644 board/korat/MAINTAINERS delete mode 100644 board/korat/Makefile delete mode 100644 board/korat/README delete mode 100644 board/korat/config.mk delete mode 100644 board/korat/init.S delete mode 100644 board/korat/korat.c delete mode 100644 board/korat/u-boot-F7FC.lds delete mode 100644 board/tqc/tqm5200/cmd_tb5200.c delete mode 100644 board/w7o/Kconfig delete mode 100644 board/w7o/MAINTAINERS delete mode 100644 board/w7o/Makefile delete mode 100644 board/w7o/cmd_vpd.c delete mode 100644 board/w7o/errors.h delete mode 100644 board/w7o/flash.c delete mode 100644 board/w7o/fpga.c delete mode 100644 board/w7o/fsboot.c delete mode 100644 board/w7o/init.S delete mode 100644 board/w7o/post1.S delete mode 100644 board/w7o/post2.c delete mode 100644 board/w7o/u-boot.lds.debug delete mode 100644 board/w7o/vpd.c delete mode 100644 board/w7o/vpd.h delete mode 100644 board/w7o/w7o.c delete mode 100644 board/w7o/w7o.h delete mode 100644 board/w7o/watchdog.c delete mode 100644 configs/BC3450_defconfig delete mode 100644 configs/JSE_defconfig delete mode 100644 configs/MPC8308RDB_defconfig delete mode 100644 configs/MPC8313ERDB_33_defconfig delete mode 100644 configs/MPC8313ERDB_66_defconfig delete mode 100644 configs/MPC8313ERDB_NAND_33_defconfig delete mode 100644 configs/MPC8313ERDB_NAND_66_defconfig delete mode 100644 configs/MPC8315ERDB_defconfig delete mode 100644 configs/MPC8323ERDB_defconfig delete mode 100644 configs/MPC832XEMDS_ATM_defconfig delete mode 100644 configs/MPC832XEMDS_HOST_33_defconfig delete mode 100644 configs/MPC832XEMDS_HOST_66_defconfig delete mode 100644 configs/MPC832XEMDS_SLAVE_defconfig delete mode 100644 configs/MPC832XEMDS_defconfig delete mode 100644 configs/MPC8349EMDS_defconfig delete mode 100644 configs/MPC8349ITXGP_defconfig delete mode 100644 configs/MPC8349ITX_LOWBOOT_defconfig delete mode 100644 configs/MPC8349ITX_defconfig delete mode 100644 configs/MPC837XEMDS_HOST_defconfig delete mode 100644 configs/MPC837XEMDS_defconfig delete mode 100644 configs/TB5200_B_defconfig delete mode 100644 configs/TB5200_defconfig delete mode 100644 configs/W7OLMC_defconfig delete mode 100644 configs/W7OLMG_defconfig delete mode 100644 configs/aev_defconfig delete mode 100644 configs/galaxy5200_LOWBOOT_defconfig delete mode 100644 configs/galaxy5200_defconfig delete mode 100644 configs/korat_defconfig delete mode 100644 configs/korat_perm_defconfig delete mode 100644 include/configs/BC3450.h delete mode 100644 include/configs/JSE.h delete mode 100644 include/configs/MPC8308RDB.h delete mode 100644 include/configs/MPC8313ERDB.h delete mode 100644 include/configs/MPC8315ERDB.h delete mode 100644 include/configs/MPC8323ERDB.h delete mode 100644 include/configs/MPC832XEMDS.h delete mode 100644 include/configs/MPC8349EMDS.h delete mode 100644 include/configs/MPC8349ITX.h delete mode 100644 include/configs/MPC837XEMDS.h delete mode 100644 include/configs/TB5200.h delete mode 100644 include/configs/W7OLMC.h delete mode 100644 include/configs/W7OLMG.h delete mode 100644 include/configs/aev.h delete mode 100644 include/configs/galaxy5200.h delete mode 100644 include/configs/korat.h -- 1.9.1

4 21

[U-Boot] [PATCH] board/BuR/common: use SYS_CONSOLE_OVERWRITE
by Hannes Petermaier 17 Mar '15

17 Mar '15

From: Hannes Petermaier <hannes.petermaier(a)br-automation.com> We don't want that CONSOLE is redirected to LCD upon init, we rather prefer that console is still on the serial line. Signed-off-by: Hannes Petermaier <oe5hpm(a)oevsv.at> --- board/BuR/common/common.c | 4 ++++ include/configs/bur_am335x_common.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/board/BuR/common/common.c b/board/BuR/common/common.c index 18e1520..5ff8a7e 100644 --- a/board/BuR/common/common.c +++ b/board/BuR/common/common.c @@ -641,3 +641,7 @@ int board_mmc_init(bd_t *bis) return omap_mmc_init(1, 0, 0, -1, -1); } #endif +int overwrite_console(void) +{ + return 1; +} diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h index 377e6cf..240fc46 100644 --- a/include/configs/bur_am335x_common.h +++ b/include/configs/bur_am335x_common.h @@ -142,6 +142,8 @@ #define CONFIG_SYS_PROMPT "U-Boot (BuR V2.0)# " #define CONFIG_SYS_CONSOLE_INFO_QUIET #define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */ +#define CONFIG_SYS_CONSOLE_IS_IN_ENV +#define CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE /* As stated above, the following choices are optional. */ #define CONFIG_SYS_LONGHELP -- 1.7.9.5

2 1

[U-Boot] [ANN] U-Boot v2015.04-rc4 released
by Tom Rini 17 Mar '15

17 Mar '15

Hey all, I've pushed v2015.04-rc4 out to the repository and tarballs should exist soon. We're getting really close to the end and I hope we'll have a few more small PRs come along with this and that. I think we're looking to be in decent shape overall but there's a few platforms that keep not building without errors / warnings (katmai, openrd*) and I wonder if we shouldn't just drop them. As always, if anything else is broken please speak up. Thanks all! -- Tom

1 0