July 2016 - U-Boot

[U-Boot] [PATCH] pico-imx6ul: Add USB Host support
by Vanessa Maegima 11 Jul '16

11 Jul '16

Add USB host support. Tested by connecting a USB pen drive: => usb start starting USB... USB0: Port not available. USB1: USB EHCI 1.00 scanning bus 1 for devices... 2 USB Device(s) found scanning usb for storage devices... 1 Storage Device(s) found Signed-off-by: Vanessa Maegima <vanessa.maegima(a)nxp.com> --- board/technexion/pico-imx6ul/pico-imx6ul.c | 24 +++++++++++++++++++++++- include/configs/pico-imx6ul.h | 2 +- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/board/technexion/pico-imx6ul/pico-imx6ul.c b/board/technexion/pico-imx6ul/pico-imx6ul.c index c038d43..bdf32f4 100644 --- a/board/technexion/pico-imx6ul/pico-imx6ul.c +++ b/board/technexion/pico-imx6ul/pico-imx6ul.c @@ -59,6 +59,9 @@ static iomux_v3_cfg_t const usdhc1_pads[] = { MX6_PAD_NAND_CLE__USDHC1_DATA7 | MUX_PAD_CTRL(USDHC_PAD_CTRL), }; +#define USB_OTHERREGS_OFFSET 0x800 +#define UCTRL_PWR_POL (1 << 9) + static iomux_v3_cfg_t const usb_otg_pad[] = { MX6_PAD_GPIO1_IO00__ANATOP_OTG1_ID | MUX_PAD_CTRL(OTG_ID_PAD_CTRL), }; @@ -98,7 +101,26 @@ int board_early_init_f(void) int board_usb_phy_mode(int port) { - return USB_INIT_DEVICE; + if (port == 1) + return USB_INIT_HOST; + else + return USB_INIT_DEVICE; +} + +int board_ehci_hcd_init(int port) +{ + u32 *usbnc_usb_ctrl; + + if (port > 1) + return -EINVAL; + + usbnc_usb_ctrl = (u32 *)(USB_BASE_ADDR + USB_OTHERREGS_OFFSET + + port * 4); + + /* Set Power polarity */ + setbits_le32(usbnc_usb_ctrl, UCTRL_PWR_POL); + + return 0; } int board_init(void) diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index d848ead..01edc03 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -42,7 +42,7 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) #define CONFIG_MXC_USB_FLAGS 0 -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 /* Only OTG1 port enabled */ +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 #define CONFIG_CI_UDC #define CONFIG_USBD_HS -- 1.9.1

3 3

[U-Boot] [PATCH v2] sunxi: Add support for multiple ethadrr-esses
by Hans de Goede 11 Jul '16

11 Jul '16

Currently we fill ethaddr with a fixed unique address based on the SoCs serial (from the sid) to make sure that boards which use the integrated emac / gmac get a fixed mac rather then a random one. On some boards the wifi does not come with a fixed mac either, so we need to also set eth1addr. This commit changes the ethaddr setting code to check for ethernet%d aliases (as fdt_fixup_ethernet does) and set an ethaddr variable for all present aliases. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- Changes in v2: -Only set ethaddr env variable for ethernet interfaces which have an ethernet%d alias in the dt aliases node --- board/sunxi/board.c | 59 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 43 insertions(+), 16 deletions(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 78dfda5..955a44f 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -26,6 +26,7 @@ #endif #include <asm/gpio.h> #include <asm/io.h> +#include <libfdt.h> #include <nand.h> #include <net.h> #include <sy8106a.h> @@ -609,36 +610,38 @@ static void parse_spl_header(const uint32_t spl_addr) } #endif -#ifdef CONFIG_MISC_INIT_R -int misc_init_r(void) +static void setup_environment(const void *fdt) { char serial_string[17] = { 0 }; unsigned int sid[4]; uint8_t mac_addr[6]; - int ret; - -#if !defined(CONFIG_SPL_BUILD) - setenv("fel_booted", NULL); - setenv("fel_scriptaddr", NULL); - /* determine if we are running in FEL mode */ - if (!is_boot0_magic(SPL_ADDR + 4)) { /* eGON.BT0 */ - setenv("fel_booted", "1"); - parse_spl_header(SPL_ADDR); - } -#endif + char ethaddr[16]; + int i, ret; ret = sunxi_get_sid(sid); if (ret == 0 && sid[0] != 0 && sid[3] != 0) { - if (!getenv("ethaddr")) { + for (i = 0; i < 4; i++) { + sprintf(ethaddr, "ethernet%d", i); + if (!fdt_get_alias(fdt, ethaddr)) + continue; + + if (i == 0) + strcpy(ethaddr, "ethaddr"); + else + sprintf(ethaddr, "eth%daddr", i); + + if (getenv(ethaddr)) + continue; + /* Non OUI / registered MAC address */ - mac_addr[0] = 0x02; + mac_addr[0] = (i << 4) | 0x02; mac_addr[1] = (sid[0] >> 0) & 0xff; mac_addr[2] = (sid[3] >> 24) & 0xff; mac_addr[3] = (sid[3] >> 16) & 0xff; mac_addr[4] = (sid[3] >> 8) & 0xff; mac_addr[5] = (sid[3] >> 0) & 0xff; - eth_setenv_enetaddr("ethaddr", mac_addr); + eth_setenv_enetaddr(ethaddr, mac_addr); } if (!getenv("serial#")) { @@ -648,6 +651,24 @@ int misc_init_r(void) setenv("serial#", serial_string); } } +} + +#ifdef CONFIG_MISC_INIT_R +int misc_init_r(void) +{ + int ret; + +#if !defined(CONFIG_SPL_BUILD) + setenv("fel_booted", NULL); + setenv("fel_scriptaddr", NULL); + /* determine if we are running in FEL mode */ + if (!is_boot0_magic(SPL_ADDR + 4)) { /* eGON.BT0 */ + setenv("fel_booted", "1"); + parse_spl_header(SPL_ADDR); + } +#endif + + setup_environment(gd->fdt_blob); #ifndef CONFIG_MACH_SUN9I ret = sunxi_usb_phy_probe(); @@ -664,6 +685,12 @@ int ft_board_setup(void *blob, bd_t *bd) { int __maybe_unused r; + /* + * Call setup_environment again in case the boot fdt has + * ethernet aliases the u-boot copy does not have. + */ + setup_environment(blob); + #ifdef CONFIG_VIDEO_DT_SIMPLEFB r = sunxi_simplefb_setup(blob); if (r) -- 2.7.4

2 3

Re: [U-Boot] [PATCH 2/3] ARM: board: cm_fx6: fixup mtd partitions in the fdt
by Christopher Spinrath 11 Jul '16

11 Jul '16

Hi Nikita, On 10.07.2016 09:52, Nikita Kiryanov wrote: > Hi Christopher, > > On Thu, Jul 07, 2016 at 03:30:25PM +0200, Christopher Spinrath wrote: >> Hi Nikita, >> >> On 07/07/2016 10:53 AM, Nikita Kiryanov wrote: >>> On Wed, Jun 22, 2016 at 07:17:53PM +0300, Igor Grinberg wrote: >>>> On 06/19/2016 06:44 PM, Christopher Spinrath wrote: >>>>> The cm-fx6 module has an on-board st,m25p compatible spi flash chip >>>>> used for u-boot (binary & environment). Overwrite the partitions in >>>>> the device tree by the partition table provided in the mtdparts >>>>> environment variable, if it is set. >>>>> >>>>> This allows to specify a kernel independent partitioning in the >>>>> environment and provides a convient way for the user to adapt the >>>>> partition table. >>>>> >>>>> Signed-off-by: Christopher Spinrath <christopher.spinrath(a)rwth-aachen.de> >>>>> --- >>>>> board/compulab/cm_fx6/cm_fx6.c | 16 +++++++++++++++- >>>>> 1 file changed, 15 insertions(+), 1 deletion(-) >>>>> >>>>> diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c >>>>> index 712057a..81a7ae2 100644 >>>>> --- a/board/compulab/cm_fx6/cm_fx6.c >>>>> +++ b/board/compulab/cm_fx6/cm_fx6.c >>>> >>>> [...] >>>> >>>>> +#ifdef CONFIG_FDT_FIXUP_PARTITIONS >>>>> +struct node_info nodes[] = { >>>>> + { "st,m25p", MTD_DEV_TYPE_NOR, }, >>>> >>>> Nikita, is this enough for all flashes we assemble on cm-fx6? >>> >>> Yes, CM-FX6 is using M25PX16 and SST25VF016B, both of which are >>> supported by the m25p80.c driver. However, on the mainline branch >>> I don't see "m25p" in the list of device ids, and IIRC the request >>> is to favor "jedec,spi-nor" as compatible string over device specific >>> ones. >> >> Linux is going to use "st,m25p", "jedec,spi-nor" as compatible list >> (currently queued for inclusion in v4.8: >> https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/tree/arch/arm/… >> ). >> >> I have chosen "st,m25p" here to cover both the mainline and CompuLab's >> device trees (I have seen some where "jedec,spi-nor" is not in the >> list). However, if you prefer I will switch to "jedec,spi-nor" >> (excluding some device trees) in v2. > > Does it have to be an "or" situation? m25p is necessary to serve older CM-FX6 > kernels, but it is not supported in the mainline kernel, so the correct > course of actions seems to be to use both "st,m25p" and "jedec,spi-nor". This has nothing to do with the kernel itself; the compatible is only used to find the correct dt node describing the flash chip and as I said in my previous email, the upstream device tree node is going to have the st,m25p compatible string. On the other hand, m25p is not documented but it used to be in upstream device trees. Since it has been removed from most of them recently, I agree that having both compatibles is a good idea. From a quick look at the source code it should be possible. I will verify this for v2. Thanks, Christopher

1 0

[U-Boot] [PATCH 1/4] sunxi: Use BROM stored boot_media value to determine our boot-source
by Hans de Goede 11 Jul '16

11 Jul '16

Now that we know that the BROM stores a value indicating the boot-source at the beginning of SRAM, use that instead of trying to recreate the BROM's boot probing. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- arch/arm/include/asm/arch-sunxi/mmc.h | 1 - arch/arm/mach-sunxi/board.c | 34 +++++++++++----------------------- board/sunxi/board.c | 3 +-- drivers/mmc/sunxi_mmc.c | 17 ----------------- 4 files changed, 12 insertions(+), 43 deletions(-) diff --git a/arch/arm/include/asm/arch-sunxi/mmc.h b/arch/arm/include/asm/arch-sunxi/mmc.h index 3da360b..cb52e64 100644 --- a/arch/arm/include/asm/arch-sunxi/mmc.h +++ b/arch/arm/include/asm/arch-sunxi/mmc.h @@ -127,5 +127,4 @@ struct sunxi_mmc { #define SUNXI_MMC_COMMON_RESET (1 << 18) struct mmc *sunxi_mmc_init(int sdc_no); -int sunxi_mmc_has_egon_boot_signature(struct mmc *mmc); #endif /* _SUNXI_MMC_H */ diff --git a/arch/arm/mach-sunxi/board.c b/arch/arm/mach-sunxi/board.c index 3f5116b..06a1986 100644 --- a/arch/arm/mach-sunxi/board.c +++ b/arch/arm/mach-sunxi/board.c @@ -203,7 +203,8 @@ DECLARE_GLOBAL_DATA_PTR; */ u32 spl_boot_device(void) { - __maybe_unused struct mmc *mmc0, *mmc1; + int boot_source; + /* * When booting from the SD card or NAND memory, the "eGON.BT0" * signature is expected to be found in memory at the address 0x0004 @@ -223,32 +224,19 @@ u32 spl_boot_device(void) if (!is_boot0_magic(SPL_ADDR + 4)) /* eGON.BT0 */ return BOOT_DEVICE_BOARD; -#ifdef CONFIG_SPL_SPI_SUNXI - if (readb(SPL_ADDR + 0x28) == SUNXI_BOOTED_FROM_SPI) - return BOOT_DEVICE_SPI; -#endif - - /* The BROM will try to boot from mmc0 first, so try that first. */ -#ifdef CONFIG_MMC - mmc_initialize(gd->bd); - mmc0 = find_mmc_device(0); - if (sunxi_mmc_has_egon_boot_signature(mmc0)) + boot_source = readb(SPL_ADDR + 0x28); + switch (boot_source) { + case SUNXI_BOOTED_FROM_MMC0: return BOOT_DEVICE_MMC1; -#endif - - /* Fallback to booting NAND if enabled. */ - if (IS_ENABLED(CONFIG_SPL_NAND_SUPPORT)) + case SUNXI_BOOTED_FROM_NAND: return BOOT_DEVICE_NAND; - -#ifdef CONFIG_MMC - if (CONFIG_MMC_SUNXI_SLOT_EXTRA == 2) { - mmc1 = find_mmc_device(1); - if (sunxi_mmc_has_egon_boot_signature(mmc1)) - return BOOT_DEVICE_MMC2; + case SUNXI_BOOTED_FROM_MMC2: + return BOOT_DEVICE_MMC2; + case SUNXI_BOOTED_FROM_SPI: + return BOOT_DEVICE_SPI; } -#endif - panic("Could not determine boot source\n"); + panic("Unknown boot source %d\n", boot_source); return -1; /* Never reached */ } diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 9767310..840f01d 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -369,8 +369,7 @@ int board_mmc_init(bd_t *bis) * are searched there first. Note we only do this for u-boot proper, * not for the SPL, see spl_boot_device(). */ - if (!sunxi_mmc_has_egon_boot_signature(mmc0) && - sunxi_mmc_has_egon_boot_signature(mmc1)) { + if (readb(SPL_ADDR + 0x28) == SUNXI_BOOTED_FROM_MMC2) { /* Booting from emmc / mmc2, swap */ mmc0->block_dev.devnum = 1; mmc1->block_dev.devnum = 0; diff --git a/drivers/mmc/sunxi_mmc.c b/drivers/mmc/sunxi_mmc.c index 3be9a90..5d8abdc 100644 --- a/drivers/mmc/sunxi_mmc.c +++ b/drivers/mmc/sunxi_mmc.c @@ -445,23 +445,6 @@ static int sunxi_mmc_getcd(struct mmc *mmc) return !gpio_get_value(cd_pin); } -int sunxi_mmc_has_egon_boot_signature(struct mmc *mmc) -{ - char *buf = malloc(512); - int valid_signature = 0; - - if (buf == NULL) - panic("Failed to allocate memory\n"); - - if (mmc_getcd(mmc) && mmc_init(mmc) == 0 && - mmc->block_dev.block_read(&mmc->block_dev, 16, 1, buf) == 1 && - strncmp(&buf[4], "eGON.BT0", 8) == 0) - valid_signature = 1; - - free(buf); - return valid_signature; -} - static const struct mmc_ops sunxi_mmc_ops = { .send_cmd = sunxi_mmc_send_cmd, .set_ios = sunxi_mmc_set_ios, -- 2.7.4

2 5

[U-Boot] [PATCH] driver: fsl_qspi: disable AHB buffer prefetch
by Yunhui Cui 11 Jul '16

11 Jul '16

From: Yunhui Cui <yunhui.cui(a)nxp.com> A-009282: QuadSPI: QuadSPI data pre-fetch can result in incorrect data Affects: QuadSPI Description: With AHB buffer prefetch enabled, the QuadSPI may return incorrect data on the AHB interface. The buffer pre-fetch is enabled if the fetch size as configured either in the LUT or in the BUFxCR register is greater than 8 bytes. Impact: Only 64 bit read allowed. Workaround: Keep the read data size to 64 bits (8 Bytes), which disables the prefetch on the AHB buffer, and prevents this issue from occurring. Signed-off-by: Yunhui Cui <yunhui.cui(a)nxp.com> --- drivers/spi/fsl_qspi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/spi/fsl_qspi.c b/drivers/spi/fsl_qspi.c index 75cbab2..e0a002d 100644 --- a/drivers/spi/fsl_qspi.c +++ b/drivers/spi/fsl_qspi.c @@ -444,7 +444,7 @@ static void qspi_init_ahb_read(struct fsl_qspi_priv *priv) qspi_write32(priv->flags, &regs->buf1cr, QSPI_BUFXCR_INVALID_MSTRID); qspi_write32(priv->flags, &regs->buf2cr, QSPI_BUFXCR_INVALID_MSTRID); qspi_write32(priv->flags, &regs->buf3cr, QSPI_BUF3CR_ALLMST_MASK | - (0x80 << QSPI_BUF3CR_ADATSZ_SHIFT)); + (0x1 << QSPI_BUF3CR_ADATSZ_SHIFT)); /* We only use the buffer3 */ qspi_write32(priv->flags, &regs->buf0ind, 0); -- 2.1.0.27.g96db324

3 4

[U-Boot] [RESEND PATCH v3 00/12] Convert davinci_spi to DM
by Vignesh R 11 Jul '16

11 Jul '16

This series converts davinci_spi driver to adapt to driver model framework. And enables the driver on k2l, k2e, k2hk evms. Also, added support for davinci_spi on k2g evm. Tested on k2l, k2e, k2hk and k2g evms. Resend: Rebased on top of v2016.07-rc3 Vignesh R (12): dm: core: implement dev_map_phsymem() spi: davinci_spi: Convert to driver to adapt to DM keystone2: spi: do not define DM_SPI and DM_SPI_FLASH for SPL build ARM: dts: keystone2: add SPI aliases for davinci SPI nodes ARM: dts: k2hk: Enable Davinci SPI controller defconfig: k2hk_evm_defconfig: enable SPI driver model ARM: dts: k2e: Enable Davinci SPI controller defconfig: k2e_evm_defconfig: enable SPI driver model ARM: dts: k2l: Enable Davinci SPI controller defconfig: k2l_evm_defconfig: enable SPI driver model ARM: dts: k2g: add support for Davinci SPI controller defconfig: k2g_evm_defconfig: enable SPI driver model arch/arm/dts/k2e-evm.dts | 3 +- arch/arm/dts/k2g-evm.dts | 24 +++ arch/arm/dts/k2g.dtsi | 47 +++++ arch/arm/dts/k2hk-evm.dts | 3 +- arch/arm/dts/k2l-evm.dts | 3 +- arch/arm/dts/keystone.dtsi | 3 + configs/k2e_evm_defconfig | 2 + configs/k2g_evm_defconfig | 2 + configs/k2hk_evm_defconfig | 2 + configs/k2l_evm_defconfig | 2 + drivers/core/device.c | 11 ++ drivers/spi/davinci_spi.c | 329 +++++++++++++++++++++++++---------- include/configs/ti_armv7_keystone2.h | 4 + include/dm/device.h | 13 ++ 14 files changed, 356 insertions(+), 92 deletions(-) -- 2.9.0

3 17

[U-Boot] [PATCH] rockchip: disable CONFIG_EFI_LOADER
by Ziyuan Xu 11 Jul '16

11 Jul '16

Disable EFI applications feature for rockchip platform. Signed-off-by: Ziyuan Xu <xzy.xu(a)rock-chips.com> --- configs/chromebook_jerry_defconfig | 1 + configs/evb-rk3036_defconfig | 1 + configs/kylin-rk3036_defconfig | 1 + configs/rock2_defconfig | 1 + 4 files changed, 4 insertions(+) diff --git a/configs/chromebook_jerry_defconfig b/configs/chromebook_jerry_defconfig index d5bc515..b020066 100644 --- a/configs/chromebook_jerry_defconfig +++ b/configs/chromebook_jerry_defconfig @@ -10,6 +10,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-jerry" CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 CONFIG_HUSH_PARSER=y +CONFIG_EFI_LOADER=n CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_MMC=y diff --git a/configs/evb-rk3036_defconfig b/configs/evb-rk3036_defconfig index 9894fff..5f816ec 100644 --- a/configs/evb-rk3036_defconfig +++ b/configs/evb-rk3036_defconfig @@ -6,6 +6,7 @@ CONFIG_SPL_STACK_R_ADDR=0x80000 CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk" CONFIG_SPL_STACK_R=y CONFIG_HUSH_PARSER=y +CONFIG_EFI_LOADER=n CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_MMC=y diff --git a/configs/kylin-rk3036_defconfig b/configs/kylin-rk3036_defconfig index 0ff6c6b..4a043af 100644 --- a/configs/kylin-rk3036_defconfig +++ b/configs/kylin-rk3036_defconfig @@ -7,6 +7,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3036-sdk" CONFIG_SPL_STACK_R=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y +CONFIG_EFI_LOADER=n # CONFIG_CMD_IMLS is not set CONFIG_CMD_MMC=y CONFIG_CMD_SF=y diff --git a/configs/rock2_defconfig b/configs/rock2_defconfig index 3e16b80..e07100e 100644 --- a/configs/rock2_defconfig +++ b/configs/rock2_defconfig @@ -8,6 +8,7 @@ CONFIG_DEFAULT_DEVICE_TREE="rk3288-rock2-square" CONFIG_SPL_STACK_R=y CONFIG_SPL_STACK_R_MALLOC_SIMPLE_LEN=0x2000 CONFIG_HUSH_PARSER=y +CONFIG_EFI_LOADER=n CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set CONFIG_CMD_MMC=y -- 1.9.1

2 2

[U-Boot] [RESEND PATCH 0/1] rockchip: add the support for evb-rk3288 board
by Ziyuan Xu 11 Jul '16

11 Jul '16

This patch adds support for the evb-rk3288 which is a rk3288-based development board. The same as firefly, it also supports booting from eMMC or SD card, the default is eMMC. Please refer to doc/README.rockchip to achieve the upgrade approach like firefly-rk3288. Ziyuan Xu (1): rockchip: add basic support for evb-rk3288 board arch/arm/dts/Makefile | 1 + arch/arm/dts/rk3288-evb.dts | 59 +++++ arch/arm/dts/rk3288-evb.dtsi | 379 ++++++++++++++++++++++++++++++ arch/arm/mach-rockchip/rk3288-board-spl.c | 4 +- arch/arm/mach-rockchip/rk3288/Kconfig | 10 + board/evb-rk3288/evb-rk3288/Kconfig | 15 ++ board/evb-rk3288/evb-rk3288/MAINTAINERS | 6 + board/evb-rk3288/evb-rk3288/Makefile | 7 + board/evb-rk3288/evb-rk3288/evb-rk3288.c | 15 ++ configs/evb-rk3288_defconfig | 67 ++++++ doc/README.rockchip | 3 +- include/configs/evb-rk3288.h | 26 ++ 12 files changed, 590 insertions(+), 2 deletions(-) create mode 100644 arch/arm/dts/rk3288-evb.dts create mode 100644 arch/arm/dts/rk3288-evb.dtsi create mode 100644 board/evb-rk3288/evb-rk3288/Kconfig create mode 100644 board/evb-rk3288/evb-rk3288/MAINTAINERS create mode 100644 board/evb-rk3288/evb-rk3288/Makefile create mode 100644 board/evb-rk3288/evb-rk3288/evb-rk3288.c create mode 100644 configs/evb-rk3288_defconfig create mode 100644 include/configs/evb-rk3288.h -- 1.9.1

3 4

[U-Boot] Ethernet on Colombus (sun6i-a31-colombus)
by Quentin Schulz 10 Jul '16

10 Jul '16

Hi, I put U-Boot for the Colombus on an SD Card but could not make Ethernet work. In U-Boot v2015.10, v2016.01 and v2016.05, Ethernet port is not detected. In U-Boot v2016.03, the Ethernet port is detected but cannot be used. I get the following error: => dhcp ethernet@01c30000 Waiting for PHY auto negotiation to complete......... TIMEOUT ! ethernet@01c30000: No link. Thank you, Quentin

3 2

[U-Boot] [PATCH] sunxi: Remove some unnecessary #ifdefs
by Hans de Goede 10 Jul '16

10 Jul '16

We always define CONFIG_MISC_INIT_R on sunxi and misc_init_r is never called in the spl, so the linker will optimize it and parse_spl_header(), of which it is the only caller, away. On the tests I've done (Orange Pi PC build) the SPL actually becomes 8 bytes smaller with this patch. Signed-off-by: Hans de Goede <hdegoede(a)redhat.com> --- board/sunxi/board.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/board/sunxi/board.c b/board/sunxi/board.c index 955a44f..9767310 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -20,12 +20,14 @@ #include <asm/arch/dram.h> #include <asm/arch/gpio.h> #include <asm/arch/mmc.h> +#include <asm/arch/spl.h> #include <asm/arch/usb_phy.h> #ifndef CONFIG_ARM64 #include <asm/armv7.h> #endif #include <asm/gpio.h> #include <asm/io.h> +#include <environment.h> #include <libfdt.h> #include <nand.h> #include <net.h> @@ -572,10 +574,6 @@ void get_board_serial(struct tag_serialnr *serialnr) } #endif -#if !defined(CONFIG_SPL_BUILD) -#include <asm/arch/spl.h> -#include <environment.h> - /* * Check the SPL header for the "sunxi" variant. If found: parse values * that might have been passed by the loader ("fel" utility), and update @@ -608,7 +606,6 @@ static void parse_spl_header(const uint32_t spl_addr) /* otherwise assume .scr format (mkimage-type script) */ setenv_hex("fel_scriptaddr", spl->fel_script_address); } -#endif static void setup_environment(const void *fdt) { @@ -653,12 +650,10 @@ static void setup_environment(const void *fdt) } } -#ifdef CONFIG_MISC_INIT_R int misc_init_r(void) { int ret; -#if !defined(CONFIG_SPL_BUILD) setenv("fel_booted", NULL); setenv("fel_scriptaddr", NULL); /* determine if we are running in FEL mode */ @@ -666,7 +661,6 @@ int misc_init_r(void) setenv("fel_booted", "1"); parse_spl_header(SPL_ADDR); } -#endif setup_environment(gd->fdt_blob); @@ -679,7 +673,6 @@ int misc_init_r(void) return 0; } -#endif int ft_board_setup(void *blob, bd_t *bd) { -- 2.7.4

2 1