December 2014 - U-Boot

[U-Boot] [PATCH] sun7i: Add new Bananapro board / defconfig
by Hans de Goede 31 Dec '14

31 Dec '14

Add support for the new Bananapro A20 development board from lemaker.org. This board features 1G RAM, 2 USB A receptacles, 1 micro USB receptacle for OTG, 1 micro USB receptacle for power, HDMI, sata, Gbit ethernet, ir receiver, 3.5 mm jack for a/v out, on board microphone, 40 gpio pins and sdio wifi. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- board/sunxi/Kconfig | 4 ++++ board/sunxi/Makefile | 1 + board/sunxi/gmac.c | 2 +- configs/Bananapro_defconfig | 9 +++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 configs/Bananapro_defconfig diff --git a/board/sunxi/Kconfig b/board/sunxi/Kconfig index 0cbfb26..8782394 100644 --- a/board/sunxi/Kconfig +++ b/board/sunxi/Kconfig @@ -97,6 +97,10 @@ config TARGET_BANANAPI bool "BANANAPI" depends on MACH_SUN7I +config TARGET_BANANAPRO + bool "BANANAPRO" + depends on MACH_SUN7I + config TARGET_COLOMBUS bool "COLOMBUS" depends on MACH_SUN6I diff --git a/board/sunxi/Makefile b/board/sunxi/Makefile index 97aff10..8ca01f6 100644 --- a/board/sunxi/Makefile +++ b/board/sunxi/Makefile @@ -22,6 +22,7 @@ obj-$(CONFIG_TARGET_A20_OLINUXINO_M) += dram_sun7i_384_1024_iow16.o obj-$(CONFIG_TARGET_AUXTEK_T004) += dram_a10s_olinuxino_m.o obj-$(CONFIG_TARGET_BA10_TV_BOX) += dram_sun4i_384_1024_iow8.o obj-$(CONFIG_TARGET_BANANAPI) += dram_bananapi.o +obj-$(CONFIG_TARGET_BANANAPRO) += dram_bananapi.o obj-$(CONFIG_TARGET_CUBIEBOARD) += dram_cubieboard.o obj-$(CONFIG_TARGET_CUBIEBOARD2) += dram_cubieboard2.o obj-$(CONFIG_TARGET_CUBIETRUCK) += dram_cubietruck.o diff --git a/board/sunxi/gmac.c b/board/sunxi/gmac.c index 571bc9e..4e4615e 100644 --- a/board/sunxi/gmac.c +++ b/board/sunxi/gmac.c @@ -34,7 +34,7 @@ int sunxi_gmac_initialize(bd_t *bis) * need to set bits 10-12 GTXDC "GMAC Transmit Clock Delay Chain" * of the GMAC clk register to 3. */ -#ifdef CONFIG_TARGET_BANANAPI +#if defined CONFIG_TARGET_BANANAPI || defined CONFIG_TARGET_BANANAPRO setbits_le32(&ccm->gmac_clk_cfg, 0x3 << 10); #endif diff --git a/configs/Bananapro_defconfig b/configs/Bananapro_defconfig new file mode 100644 index 0000000..7f9ce13 --- /dev/null +++ b/configs/Bananapro_defconfig @@ -0,0 +1,9 @@ +CONFIG_SPL=y +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,MACPWR=SUNXI_GPH(23),AHCI,USB_EHCI" +CONFIG_FDTFILE="sun7i-a20-bananapro.dtb" +CONFIG_USB1_VBUS_PIN="PH0" +CONFIG_USB2_VBUS_PIN="PH1" ++S:CONFIG_ARM=y ++S:CONFIG_ARCH_SUNXI=y ++S:CONFIG_MACH_SUN7I=y ++S:CONFIG_TARGET_BANANAPRO=y -- 2.1.0

2 3

[U-Boot] [PATCH v4 0/5] qspi: qspi support for mx6sxsabresd
by Peng Fan 31 Dec '14

31 Dec '14

This patch set is to support qspi for mx6sxsabresd board. To mx6sxsabresd Revb board, 32M flash is used, but in header file, CONFIG_SPI_FLASH_BAR is not defined, and we still use SZ_16M. The LUT initialization qspi_set_lut function uses 32BIT addr, however CONFIG_SPI_FLASH_BAR and 24BIT addr should be used to access bigger than 16MB size flash, and BRRD/BRWR should also be supported. Future patches will fix this. Since flash opcodes are not recommended to use in driver level, use QSPI_CMD_xx to replace OPCODE_xx. It is qspi controller's feature to program LUT with QSPI_CMD_xx which same value with OPCODE_xx. Since Revb board's qspi flash support 4K erase, 4K erase is added in driver. Peng Fan (5): QuadSPI: use QSPI_CMD_xx instead of flash opcodes QuadSPI: use correct amba_base arm:mx6sx add QSPI support imx:qspi add 4K erase support imx:mx6sxsabresd add qspi support arch/arm/cpu/armv7/mx6/clock.c | 50 ++++++++++ arch/arm/include/asm/arch-mx6/clock.h | 1 + arch/arm/include/asm/arch-mx6/imx-regs.h | 12 +-- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 40 ++++++++ drivers/spi/fsl_qspi.c | 137 +++++++++++++++++++--------- include/configs/mx6sxsabresd.h | 12 +++ 6 files changed, 205 insertions(+), 47 deletions(-) -- 1.8.4

3 7

[U-Boot] [PATCH] imx:mx6slevk add spi nor boot support
by Peng Fan 31 Dec '14

31 Dec '14

Add spi nor boot support for mx6slevk board. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> --- board/freescale/mx6slevk/MAINTAINERS | 1 + configs/mx6slevk_spinor_defconfig | 3 +++ include/configs/mx6slevk.h | 13 ++++++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 configs/mx6slevk_spinor_defconfig diff --git a/board/freescale/mx6slevk/MAINTAINERS b/board/freescale/mx6slevk/MAINTAINERS index 660af91..18d31a8 100644 --- a/board/freescale/mx6slevk/MAINTAINERS +++ b/board/freescale/mx6slevk/MAINTAINERS @@ -4,3 +4,4 @@ S: Maintained F: board/freescale/mx6slevk/ F: include/configs/mx6slevk.h F: configs/mx6slevk_defconfig +F: configs/mx6slevk_spinor_defconfig diff --git a/configs/mx6slevk_spinor_defconfig b/configs/mx6slevk_spinor_defconfig new file mode 100644 index 0000000..93efe73 --- /dev/null +++ b/configs/mx6slevk_spinor_defconfig @@ -0,0 +1,3 @@ +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6slevk/imximage.cfg,MX6SL,SYS_BOOT_SPINOR" +CONFIG_ARM=y +CONFIG_TARGET_MX6SLEVK=y diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index e3e7f76..e6c4130 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -187,9 +187,20 @@ /* FLASH and environment organization */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_ENV_OFFSET (6 * SZ_64K) #define CONFIG_ENV_SIZE SZ_8K + +#if defined CONFIG_SYS_BOOT_SPINOR +#define CONFIG_ENV_IS_IN_SPI_FLASH +#define CONFIG_ENV_OFFSET (768 * 1024) +#define CONFIG_ENV_SECT_SIZE (64 * 1024) +#define CONFIG_ENV_SPI_BUS CONFIG_SF_DEFAULT_BUS +#define CONFIG_ENV_SPI_CS CONFIG_SF_DEFAULT_CS +#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE +#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED +#else +#define CONFIG_ENV_OFFSET (6 * SZ_64K) #define CONFIG_ENV_IS_IN_MMC +#endif #define CONFIG_OF_LIBFDT #define CONFIG_CMD_BOOTZ -- 1.8.4

3 3

[U-Boot] [PATCH v3 0/7] x86: Support pci based uart as the U-Boot serial console
by Bin Meng 31 Dec '14

31 Dec '14

This series add support to the ns16550 compatible pci devices. Newer x86 Platform Controller Hub chipset (like Topcliff, BayTrail) starts to integrate ns16550 compatible pci uart devices. In order to use them, we have to scan the pci bus and allocate memory/io address in the early phase. A gd->hose is added to save the pci bus controller hose in the early phase so that pci apis can be used. On Intel Crown Bay board, there are 4 DB9 connectors, one of which is from the superio legacy serial port and the other 3 are connected to the Topcliff PCH UART devices. In order to use them as the U-Boot serial console, we need describe those devices in the board's dts file per Open Firmware PCI bus bindings and specify it as the console via the 'stdout-path' in the chosen node. Several APIs are added in fdtdec.c to provide help for decoding the pci device nodes. Changes in v3: - Fixed a typo: parant -> parent - Return better error code in fdtdec_get_pci_addr() - Add some debug output in fdtdec_get_pci_addr() - Reuse variable 'len' instead of creating a new one 'l' - Check compatible string length and existence of '.' - Using simple_strtol() directly on the compatible sub-string - Change variable 'bn' to 'barnum' which is self-documenting - Update to use 'memory-mapped' and 'i/o-mapped' in several places - Use 'Processor Local Bus' instead of 'plb' - Change the logic in ns16550_serial_ofdata_to_platdata() to avoid goto Changes in v2: - Add a commit message - New patch to make pci apis usable before relocation - New patch to add several apis to decode pci device node - New patch to support ns16550 compatible pci uart devices - New patch to use ePAPR defined properties for x86-uart - New patch to add pci devices in crownbay.dts - Drop v1 patch: Add an API for finding pci devices in the early phase - Drop v1 patch: Support PCI UART in the x86_serial driver - Drop v1 patch: Add PCI UART related defines in crownbay.h Bin Meng (7): x86: Add missing DECLARE_GLOBAL_DATA_PTR for pci.c x86: Support pci bus scan in the early phase pci: Make pci apis usable before relocation fdt: Add several apis to decode pci device node serial: ns16550: Support ns16550 compatible pci uart devices x86: Use ePAPR defined properties for x86-uart x86: crownbay: Add pci devices in the dts file arch/x86/cpu/pci.c | 11 ++- arch/x86/dts/crownbay.dts | 81 ++++++++++++++++++ arch/x86/dts/serial.dtsi | 5 +- arch/x86/include/asm/global_data.h | 1 - arch/x86/include/asm/pci.h | 2 +- drivers/pci/pci.c | 25 ++++-- drivers/serial/ns16550.c | 31 +++++++ drivers/serial/serial_x86.c | 8 +- include/asm-generic/global_data.h | 6 ++ include/fdtdec.h | 108 +++++++++++++++++++++--- lib/fdtdec.c | 166 +++++++++++++++++++++++++++++++++---- 11 files changed, 401 insertions(+), 43 deletions(-) -- 1.8.2.1

2 13

[U-Boot] [PATCH v2 1/2] arm:mx6sx add QSPI support
by Peng Fan 31 Dec '14

31 Dec '14

Add QSPI support for mx6solox. Signed-off-by: Peng Fan <Peng.Fan(a)freescale.com> --- Changelog v2: Take Fabio's suggestion, split soc code and board code into two patches. arch/arm/cpu/armv7/mx6/clock.c | 50 +++++++++++++++++++++++++++++++++++ arch/arm/include/asm/arch-mx6/clock.h | 3 +++ drivers/spi/fsl_qspi.c | 29 ++++++++++++++++++++ 3 files changed, 82 insertions(+) diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index 820b8d5..8caa61d 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -340,6 +340,56 @@ static u32 get_mmdc_ch0_clk(void) } #endif +#ifdef CONFIG_MX6SX +/* qspi_num can be from 0 - 1 */ +void enable_qspi_clk(int qspi_num) +{ + u32 reg = 0; + /* Enable QuadSPI clock */ + switch (qspi_num) { + case 0: + /* disable the clock gate */ + clrbits_le32(&imx_ccm->CCGR3, MXC_CCM_CCGR3_QSPI1_MASK); + + /* set 50M : (50 = 396 / 2 / 4) */ + reg = readl(&imx_ccm->cscmr1); + reg &= ~(MXC_CCM_CSCMR1_QSPI1_PODF_MASK | + MXC_CCM_CSCMR1_QSPI1_CLK_SEL_MASK); + reg |= ((1 << MXC_CCM_CSCMR1_QSPI1_PODF_OFFSET) | + (2 << MXC_CCM_CSCMR1_QSPI1_CLK_SEL_OFFSET)); + writel(reg, &imx_ccm->cscmr1); + + /* enable the clock gate */ + setbits_le32(&imx_ccm->CCGR3, MXC_CCM_CCGR3_QSPI1_MASK); + break; + case 1: + /* + * disable the clock gate + * QSPI2 and GPMI_BCH_INPUT_GPMI_IO share the same clock gate, + * disable both of them. + */ + clrbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK | + MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK); + + /* set 50M : (50 = 396 / 2 / 4) */ + reg = readl(&imx_ccm->cs2cdr); + reg &= ~(MXC_CCM_CS2CDR_QSPI2_CLK_PODF_MASK | + MXC_CCM_CS2CDR_QSPI2_CLK_PRED_MASK | + MXC_CCM_CS2CDR_QSPI2_CLK_SEL_MASK); + reg |= (MXC_CCM_CS2CDR_QSPI2_CLK_PRED(0x1) | + MXC_CCM_CS2CDR_QSPI2_CLK_SEL(0x3)); + writel(reg, &imx_ccm->cs2cdr); + + /*enable the clock gate*/ + setbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK | + MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_GPMI_IO_MASK); + break; + default: + break; + } +} +#endif + #ifdef CONFIG_FEC_MXC int enable_fec_anatop_clock(enum enet_freq freq) { diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h index 339c789..9d0ba7a 100644 --- a/arch/arm/include/asm/arch-mx6/clock.h +++ b/arch/arm/include/asm/arch-mx6/clock.h @@ -60,4 +60,7 @@ int enable_i2c_clk(unsigned char enable, unsigned i2c_num); int enable_spi_clk(unsigned char enable, unsigned spi_num); void enable_ipu_clock(void); int enable_fec_anatop_clock(enum enet_freq freq); +#ifdef CONFIG_MX6SX +void enable_qspi_clk(int qspi_num); +#endif #endif /* __ASM_ARCH_CLOCK_H */ diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index ba20bef..7c8d065 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -14,7 +14,11 @@ #include "fsl_qspi.h" #define RX_BUFFER_SIZE 0x80 +#ifdef CONFIG_MX6SX +#define TX_BUFFER_SIZE 0x200 +#else #define TX_BUFFER_SIZE 0x40 +#endif #define OFFSET_BITS_MASK 0x00ffffff @@ -52,11 +56,19 @@ #endif static unsigned long spi_bases[] = { +#ifdef CONFIG_MX6SX + CONFIG_QSPI_BASE, +#else QSPI0_BASE_ADDR, +#endif }; static unsigned long amba_bases[] = { +#ifdef CONFIG_MX6SX + CONFIG_QSPI_MEMMAP_BASE, +#else QSPI0_AMBA_BASE, +#endif }; struct fsl_qspi { @@ -157,8 +169,14 @@ static void qspi_set_lut(struct fsl_qspi *qspi) qspi_write32(&regs->lut[lut_base], OPRND0(OPCODE_PP_4B) | PAD0(LUT_PAD1) | INSTR0(LUT_CMD) | OPRND1(ADDR32BIT) | PAD1(LUT_PAD1) | INSTR1(LUT_ADDR)); +#ifdef CONFIG_MX6SX + /* Use IDATSZ in IPCR to determine the size */ + qspi_write32(&regs->lut[lut_base + 1], OPRND0(0) | + PAD0(LUT_PAD1) | INSTR0(LUT_WRITE)); +#else qspi_write32(&regs->lut[lut_base + 1], OPRND0(TX_BUFFER_SIZE) | PAD0(LUT_PAD1) | INSTR0(LUT_WRITE)); +#endif qspi_write32(&regs->lut[lut_base + 2], 0); qspi_write32(&regs->lut[lut_base + 3], 0); @@ -192,6 +210,12 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, if (bus >= ARRAY_SIZE(spi_bases)) return NULL; +#ifdef CONFIG_MX6SX + /* cs should be 0 - (FSL_QSPI_FLASH_NUM - 1) */ + if (cs >= FSL_QSPI_FLASH_NUM) + return NULL; +#endif + qspi = spi_alloc_slave(struct fsl_qspi, bus, cs); if (!qspi) return NULL; @@ -215,6 +239,11 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, qspi_write32(&regs->sfb1ad, total_size | qspi->amba_base); qspi_write32(&regs->sfb2ad, total_size | qspi->amba_base); +#ifdef CONFIG_MX6SX + /* According to cs, change the amba_base to choose the flash */ + qspi->amba_base = qspi->amba_base + cs * FSL_QSPI_FLASH_SIZE; +#endif + qspi_set_lut(qspi); smpr_val = qspi_read32(&regs->smpr); -- 1.8.4

5 9

[U-Boot] [PATCH 1/8] imx: i2c: Zap unnecessary malloc() calls
by Marek Vasut 30 Dec '14

30 Dec '14

The malloc() calls are unnecessary, just allocate the stuff on stack. While at it, reorder the code a little, so that only one variable is used for the text, use snprintf() instead of sprintf() and use %01d as a formatting string to avoid any possible overflows. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Igor Grinberg <grinberg(a)compulab.co.il> Cc: Nikita Kiryanov <nikita(a)compulab.co.il> Cc: Sean Cross <xobs(a)kosagi.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Stefano Babic <sbabic(a)denx.de> Cc: Tim Harvey <tharvey(a)gateworks.com> --- arch/arm/imx-common/i2c-mxv7.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/arch/arm/imx-common/i2c-mxv7.c b/arch/arm/imx-common/i2c-mxv7.c index 34f5387..1a632e7 100644 --- a/arch/arm/imx-common/i2c-mxv7.c +++ b/arch/arm/imx-common/i2c-mxv7.c @@ -73,26 +73,21 @@ static void * const i2c_bases[] = { int setup_i2c(unsigned i2c_index, int speed, int slave_addr, struct i2c_pads_info *p) { - char *name1, *name2; + char name[9]; int ret; if (i2c_index >= ARRAY_SIZE(i2c_bases)) return -EINVAL; - name1 = malloc(9); - name2 = malloc(9); - if (!name1 || !name2) - return -ENOMEM; - - sprintf(name1, "i2c_sda%d", i2c_index); - sprintf(name2, "i2c_scl%d", i2c_index); - ret = gpio_request(p->sda.gp, name1); + snprintf(name, sizeof(name), "i2c_sda%01d", i2c_index); + ret = gpio_request(p->sda.gp, name); if (ret) - goto err_req1; + return ret; - ret = gpio_request(p->scl.gp, name2); + snprintf(name, sizeof(name), "i2c_scl%01d", i2c_index); + ret = gpio_request(p->scl.gp, name); if (ret) - goto err_req2; + goto err_req; /* Enable i2c clock */ ret = enable_i2c_clk(1, i2c_index); @@ -112,11 +107,8 @@ int setup_i2c(unsigned i2c_index, int speed, int slave_addr, err_idle: err_clk: gpio_free(p->scl.gp); -err_req2: +err_req: gpio_free(p->sda.gp); -err_req1: - free(name1); - free(name2); return ret; } -- 2.1.3

4 21

[U-Boot] [PATCH v2 0/7] x86: Support pci based uart as the U-Boot serial console
by Bin Meng 30 Dec '14

30 Dec '14

This series add support to the ns16550 compatible pci devices. Newer x86 Platform Controller Hub chipset (like Topcliff, BayTrail) starts to integrate ns16550 compatible pci uart devices. In order to use them, we have to scan the pci bus and allocate memory/io address in the early phase. A gd->hose is added to save the pci bus controller hose in the early phase so that pci apis can be used. On Intel Crown Bay board, there are 4 DB9 connectors, one of which is from the superio legacy serial port and the other 3 are connected to the Topcliff PCH UART devices. In order to use them as the U-Boot serial console, we need describe those devices in the board's dts file per Open Firmware PCI bus bindings and specify it as the console via the 'stdout-path' in the chosen node. Several APIs are added in fdtdec.c to provide help for decoding the pci device nodes. Changes in v2: - Add a commit message - New patch to make pci apis usable before relocation - New patch to add several apis to decode pci device node - New patch to support ns16550 compatible pci uart devices - New patch to use ePAPR defined properties for x86-uart - New patch to add pci devices in crownbay.dts - Drop v1 patch: Add an API for finding pci devices in the early phase - Drop v1 patch: Support PCI UART in the x86_serial driver - Drop v1 patch: Add PCI UART related defines in crownbay.h Bin Meng (7): x86: Add missing DECLARE_GLOBAL_DATA_PTR for pci.c x86: Support pci bus scan in the early phase pci: Make pci apis usable before relocation fdt: Add several apis to decode pci device node serial: ns16550: Support ns16550 compatible pci uart devices x86: Use ePAPR defined properties for x86-uart x86: crownbay: Add pci devices in the dts file arch/x86/cpu/pci.c | 11 ++- arch/x86/dts/crownbay.dts | 81 +++++++++++++++++++ arch/x86/dts/serial.dtsi | 5 +- arch/x86/include/asm/global_data.h | 1 - arch/x86/include/asm/pci.h | 2 +- drivers/pci/pci.c | 25 ++++-- drivers/serial/ns16550.c | 33 +++++++- drivers/serial/serial_x86.c | 8 +- include/asm-generic/global_data.h | 6 ++ include/fdtdec.h | 108 ++++++++++++++++++++++--- lib/fdtdec.c | 157 +++++++++++++++++++++++++++++++++---- 11 files changed, 393 insertions(+), 44 deletions(-) -- 1.8.2.1

2 19

[U-Boot] [PATCH] mx6slevk: Remove get_board_rev()
by Fabio Estevam 30 Dec '14

30 Dec '14

From: Fabio Estevam <fabio.estevam(a)freescale.com> get_board_rev() just returns the cpu revision, which does not make it really useful for distinguishing between revisions of the board. Let's get rid of get_board_rev() as it is not being used with its correct meaning. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx6slevk/mx6slevk.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/board/freescale/mx6slevk/mx6slevk.c b/board/freescale/mx6slevk/mx6slevk.c index 3834eec..838ea6c 100644 --- a/board/freescale/mx6slevk/mx6slevk.c +++ b/board/freescale/mx6slevk/mx6slevk.c @@ -308,11 +308,6 @@ int board_init(void) return 0; } -u32 get_board_rev(void) -{ - return get_cpu_rev(); -} - int checkboard(void) { puts("Board: MX6SLEVK\n"); -- 1.9.1

2 1

[U-Boot] [PATCH 2/2] embestmx6boards: convert to use config_distro_bootcmd.h
by Iain Paton 30 Dec '14

30 Dec '14

Since the Riot & Mars boards are dev boards it's likely people will want to run standard distros on them. So replace the current boot scripts with the standard one from config_distro_bootcmd.h Signed-off-by: Iain Paton <ipaton0(a)gmail.com> --- include/configs/embestmx6boards.h | 168 +++++++++----------------------------- 1 file changed, 39 insertions(+), 129 deletions(-) diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index c62c8ec..b4b3ae8 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -116,133 +116,6 @@ #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_TEXT_BASE 0x17800000 -#ifdef CONFIG_SUPPORT_EMMC_BOOT -#define EMMC_ENV \ - "emmcdev=2\0" \ - "update_emmc_firmware=" \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "if ${get_cmd} ${update_sd_firmware_filename}; then " \ - "if mmc dev ${emmcdev}; then " \ - "setexpr fw_sz ${filesize} / 0x200; " \ - "setexpr fw_sz ${fw_sz} + 1; " \ - "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ - "fi; " \ - "fi\0" -#else -#define EMMC_ENV "" -#endif - -#ifdef CONFIG_CMD_SF -#define SF_ENV \ - "update_spi_firmware=" \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "if ${get_cmd} ${update_spi_firmware_filename}; then " \ - "if sf probe; then " \ - "sf erase 0 0xc0000; " \ - "sf write ${loadaddr} 0x400 ${filesize}; " \ - "fi; " \ - "fi\0" -#else -#define SF_ENV "" -#endif - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "script=boot.scr\0" \ - "image=zImage\0" \ - "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "fdt_addr=0x18000000\0" \ - "boot_fdt=try\0" \ - "ip_dyn=yes\0" \ - "console=" CONFIG_CONSOLE_DEV "\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ - "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ - "mmcpart=1\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ - "update_sd_firmware=" \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "if mmc dev ${mmcdev}; then " \ - "if ${get_cmd} ${update_sd_firmware_filename}; then " \ - "setexpr fw_sz ${filesize} / 0x200; " \ - "setexpr fw_sz ${fw_sz} + 1; " \ - "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ - "fi; " \ - "fi\0" \ - EMMC_ENV \ - SF_ENV \ - "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=${mmcroot}\0" \ - "loadbootscript=" \ - "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ - "bootscript=echo Running bootscript from mmc ...; " \ - "source\0" \ - "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ - "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ - "mmcboot=echo Booting from mmc ...; " \ - "run mmcargs; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if run loadfdt; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ - "bootz; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "fi; " \ - "else " \ - "bootz; " \ - "fi;\0" \ - "netargs=setenv bootargs console=${console},${baudrate} " \ - "root=/dev/nfs " \ - "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ - "netboot=echo Booting from net ...; " \ - "run netargs; " \ - "if test ${ip_dyn} = yes; then " \ - "setenv get_cmd dhcp; " \ - "else " \ - "setenv get_cmd tftp; " \ - "fi; " \ - "${get_cmd} ${image}; " \ - "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ - "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ - "bootz ${loadaddr} - ${fdt_addr}; " \ - "else " \ - "if test ${boot_fdt} = try; then " \ - "bootz; " \ - "else " \ - "echo WARN: Cannot load the DT; " \ - "fi; " \ - "fi; " \ - "else " \ - "bootz; " \ - "fi;\0" - -#define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev};" \ - "if mmc rescan; then " \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loadimage; then " \ - "run mmcboot; " \ - "else run netboot; " \ - "fi; " \ - "fi; " \ - "else run netboot; fi" - #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ @@ -282,14 +155,14 @@ #if defined(CONFIG_ENV_IS_IN_MMC) /* RiOTboard */ -#define CONFIG_DEFAULT_FDT_FILE "imx6dl-riotboard.dtb" +#define CONFIG_FDTFILE "imx6dl-riotboard.dtb" #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SYS_MMC_ENV_DEV 2 /* SDHC4 */ #define CONFIG_ENV_OFFSET (6 * 64 * 1024) #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ #elif defined(CONFIG_ENV_IS_IN_SPI_FLASH) /* MarSBoard */ -#define CONFIG_DEFAULT_FDT_FILE "imx6q-marsboard.dtb" +#define CONFIG_FDTFILE "imx6q-marsboard.dtb" #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_ENV_OFFSET (768 * 1024) #define CONFIG_ENV_SECT_SIZE (8 * 1024) @@ -322,4 +195,41 @@ #include <config_distro_defaults.h> +/* 256M RAM (minimum), 32M uncompressed kernel, 16M compressed kernel, 1M fdt, + * 1M script, 1M pxe and the ramdisk at the end */ +#define MEM_LAYOUT_ENV_SETTINGS \ + "bootm_size=0x10000000\0" \ + "kernel_addr_r=0x12000000\0" \ + "fdt_addr_r=0x13000000\0" \ + "scriptaddr=0x13100000\0" \ + "pxefile_addr_r=0x13200000\0" \ + "ramdisk_addr_r=0x13300000\0" + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) \ + func(USB, usb, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> + +#define CONSOLE_STDIN_SETTINGS \ + "stdin=serial\0" + +#define CONSOLE_STDOUT_SETTINGS \ + "stdout=serial\0" \ + "stderr=serial\0" + +#define CONSOLE_ENV_SETTINGS \ + CONSOLE_STDIN_SETTINGS \ + CONSOLE_STDOUT_SETTINGS + +#define CONFIG_EXTRA_ENV_SETTINGS \ + CONSOLE_ENV_SETTINGS \ + MEM_LAYOUT_ENV_SETTINGS \ + "fdtfile=" CONFIG_FDTFILE "\0" \ + BOOTENV + #endif /* __RIOTBOARD_CONFIG_H */ -- 2.1.3

3 3

[U-Boot] [PATCH 1/2] embestmx6boards: convert to use config_distro_defaults.h
by Iain Paton 30 Dec '14

30 Dec '14

Update to use config_distro_defaults.h and remove explicit settings Signed-off-by: Iain Paton <ipaton0(a)gmail.com> --- include/configs/embestmx6boards.h | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/include/configs/embestmx6boards.h b/include/configs/embestmx6boards.h index 185edbe..c62c8ec 100644 --- a/include/configs/embestmx6boards.h +++ b/include/configs/embestmx6boards.h @@ -78,14 +78,7 @@ #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_CMD_EXT2 -#define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION - -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP -#define CONFIG_CMD_MII -#define CONFIG_CMD_NET + #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR @@ -114,14 +107,12 @@ /* Command definition */ #include <config_cmd_default.h> +#undef CONFIG_CMD_FPGA #define CONFIG_CMD_BMODE -#define CONFIG_CMD_BOOTZ #define CONFIG_CMD_SETEXPR #undef CONFIG_CMD_IMLS -#define CONFIG_BOOTDELAY 1 - #define CONFIG_LOADADDR 0x12000000 #define CONFIG_SYS_TEXT_BASE 0x17800000 @@ -255,10 +246,7 @@ #define CONFIG_ARP_TIMEOUT 200UL /* Miscellaneous configurable options */ -#define CONFIG_SYS_LONGHELP -#define CONFIG_SYS_HUSH_PARSER #define CONFIG_SYS_PROMPT_HUSH_PS2 "> " -#define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_CBSIZE 256 /* Print Buffer Size */ @@ -272,7 +260,6 @@ #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -#define CONFIG_CMDLINE_EDITING #define CONFIG_STACKSIZE (128 * 1024) /* Physical Memory Map */ @@ -312,8 +299,6 @@ #define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED #endif -#define CONFIG_OF_LIBFDT - #ifndef CONFIG_SYS_DCACHE_OFF #define CONFIG_CMD_CACHE #endif @@ -335,4 +320,6 @@ #define CONFIG_IMX_HDMI #define CONFIG_IMX_VIDEO_SKIP +#include <config_distro_defaults.h> + #endif /* __RIOTBOARD_CONFIG_H */ -- 2.1.3

3 2