November 2016 - U-Boot

[U-Boot] [PATCH 0/3] ti: common: board_detect: basic fixes for blank eeprom
by Nishanth Menon 02 Nov '16

02 Nov '16

In some cases where eeprom has not been programmed, Brad reported issues of crash at strcmp against NULL, this series was triggered thanks to issue in manufacturing flow where the mandatory eeprom programming was missed. Nishanth Menon (3): ti: common: board_detect: Replace hardcoded value with macro ti: common: board_detect: Setup initial default value for config as well ti: common: board_detect: Return a valid empty string for un-initialized eeprom board/ti/common/board_detect.c | 16 ++++++---------- board/ti/common/board_detect.h | 6 +++--- 2 files changed, 9 insertions(+), 13 deletions(-) -- 2.10.0

3 12

[U-Boot] [PATCH] cosmetic: Fix indentation in README
by Alexander von Gernler 02 Nov '16

02 Nov '16

Signed-off-by: Alexander von Gernler <grunk(a)pestilenz.org> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 3682e8c..3d90e3d 100644 --- a/README +++ b/README @@ -1659,7 +1659,7 @@ The following options need to be configured: This will also enable the command "fatwrite" enabling the user to write files to FAT. -CBFS (Coreboot Filesystem) support +- CBFS (Coreboot Filesystem) support: CONFIG_CMD_CBFS Define this to enable support for reading from a Coreboot -- 2.9.0

2 1

[U-Boot] fixup typo in omap SPI driver
by 郑祎 02 Nov '16

02 Nov '16

It seems that the register arrary should be indexed by cs, not by wordlen. -- Brock Zheng <yzheng(a)techyauld.com> 郑祎北京中科腾越科技发展有限公司北京市海淀区东北旺西路8号中关村软件园21号楼启明星辰大厦二层六区（邮编：100094）

2 1

[U-Boot] [PATCH] tools: Execute tools from objtree
by Marek Vasut 02 Nov '16

02 Nov '16

Always execute the tools from the build destination directory and with a full path, otherwise we may get errors like this (from OE-core): | ERROR: oe_runmake failed | cat ./Licenses/gpl-2.0.txt | gzip -9 -c | \ | tools/bin2header license_gzip > ./include/license.h | /bin/sh: 2: tools/bin2header: not found | tools/Makefile:256: recipe for target 'include/license.h' failed Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)konsulko.com> --- tools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index 421414b..7dacedb 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -247,14 +247,14 @@ HOST_EXTRACFLAGS += -include $(srctree)/include/libfdt_env.h \ __build: $(LOGO-y) $(LICENSE-y) $(LOGO_H): $(obj)/bmp_logo $(LOGO_BMP) - $(obj)/bmp_logo --gen-info $(LOGO_BMP) > $@ + $(objtree)/bmp_logo --gen-info $(LOGO_BMP) > $@ $(LOGO_DATA_H): $(obj)/bmp_logo $(LOGO_BMP) - $(obj)/bmp_logo --gen-data $(LOGO_BMP) > $@ + $(objtree)/bmp_logo --gen-data $(LOGO_BMP) > $@ $(LICENSE_H): $(obj)/bin2header $(srctree)/Licenses/gpl-2.0.txt cat $(srctree)/Licenses/gpl-2.0.txt | gzip -9 -c | \ - $(obj)/bin2header license_gzip > $(LICENSE_H) + $(objtree)/bin2header license_gzip > $(LICENSE_H) # Let clean descend into subdirs subdir- += env -- 2.9.3

1 1

[U-Boot] [PATCH v3] drivers: usb: fsl-dt-fixup: Fix the dt for multiple USB nodes in single traversal of device tree
by Sriram Dash 02 Nov '16

02 Nov '16

For FSL USB node fixup, the dt is walked multiple times for fixing erratum and phy type. This patch walks the tree and fixes the node till no more USB nodes are left. Signed-off-by: Sriram Dash <sriram.dash(a)nxp.com> --- Depends on the following patch: https://patchwork.ozlabs.org/patch/682139/ Changes in v3: - Remove ENOSPC. - Create a table of USB erratum, to be used to fix dt. Changes in v2: - Modify patch description and title - Remove counting the dt nodes drivers/usb/common/fsl-dt-fixup.c | 209 ++++++++++++++++++++------------------ 1 file changed, 109 insertions(+), 100 deletions(-) diff --git a/drivers/usb/common/fsl-dt-fixup.c b/drivers/usb/common/fsl-dt-fixup.c index 63a24f7..addeb8c 100644 --- a/drivers/usb/common/fsl-dt-fixup.c +++ b/drivers/usb/common/fsl-dt-fixup.c @@ -16,10 +16,6 @@ #include <fsl_usb.h> #include <fdt_support.h> -#ifndef CONFIG_USB_MAX_CONTROLLER_COUNT -#define CONFIG_USB_MAX_CONTROLLER_COUNT 1 -#endif - /* USB Controllers */ #define FSL_USB2_MPH "fsl-usb2-mph" #define FSL_USB2_DR "fsl-usb2-dr" @@ -33,6 +29,52 @@ static const char * const compat_usb_fsl[] = { NULL }; +enum usb_node_type { + USB2_MPH = 0, + USB2_DR, + SNPS, + USB_COMPAT_END +}; + +enum fdt_fsl_usb_erratum { + A006261, + A007075, + A007792, + A005697, + A008751, + FSL_USB_ERRATUM_END +}; + +struct fsl_dt_usb_erratum { + bool (*has_fsl_usb_erratum)(void); + char *dt_set_prop; +}; + +struct fsl_dt_usb_erratum + erratum_tlb[USB_COMPAT_END][FSL_USB_ERRATUM_END] = { +/*MPH Erratum */ + [USB2_MPH][A006261] = {&has_erratum_a006261, + "fsl,usb-erratum-a006261"}, + [USB2_MPH][A007075] = {&has_erratum_a007075, + "fsl,usb-erratum-a007075"}, + [USB2_MPH][A007792] = {&has_erratum_a007792, + "fsl,usb-erratum-a007792"}, + [USB2_MPH][A005697] = {&has_erratum_a005697, + "fsl,usb-erratum-a005697"}, +/*DR Erratum */ + [USB2_DR][A006261] = {&has_erratum_a006261, + "fsl,usb-erratum-a006261"}, + [USB2_DR][A007075] = {&has_erratum_a007075, + "fsl,usb-erratum-a007075"}, + [USB2_DR][A007792] = {&has_erratum_a007792, + "fsl,usb-erratum-a007792"}, + [USB2_DR][A005697] = {&has_erratum_a005697, + "fsl,usb-erratum-a005697"}, +/*SNPS Erratum */ + [SNPS][A008751] = {&has_erratum_a008751, + "fsl,usb-erratum-a008751"}, +}; + static int fdt_usb_get_node_type(void *blob, int start_offset, int *node_offset, const char **node_type) { @@ -54,25 +96,19 @@ static int fdt_usb_get_node_type(void *blob, int start_offset, } static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, - const char *phy_type, int start_offset) + const char *phy_type, int node_offset, + const char **node_type) { const char *prop_mode = "dr_mode"; const char *prop_type = "phy_type"; - const char *node_type = NULL; - int node_offset; - int err; - - err = fdt_usb_get_node_type(blob, start_offset, - &node_offset, &node_type); - if (err < 0) - return err; + int err = 0; if (mode) { err = fdt_setprop(blob, node_offset, prop_mode, mode, strlen(mode) + 1); if (err < 0) printf("WARNING: could not set %s for %s: %s.\n", - prop_mode, node_type, fdt_strerror(err)); + prop_mode, *node_type, fdt_strerror(err)); } if (phy_type) { @@ -80,79 +116,77 @@ static int fdt_fixup_usb_mode_phy_type(void *blob, const char *mode, strlen(phy_type) + 1); if (err < 0) printf("WARNING: could not set %s for %s: %s.\n", - prop_type, node_type, fdt_strerror(err)); + prop_type, *node_type, fdt_strerror(err)); } - return node_offset; + return err; } -static int fsl_fdt_fixup_usb_erratum(void *blob, const char *prop_erratum, - const char *controller_type, - int start_offset) +static int fsl_fdt_fixup_usb_erratum(int node_offset, void *blob, + int dt_node_type) { - int node_offset, err; - const char *node_type = NULL; - const char *node_name = NULL; + int i, j, ret = -1; + for (i = dt_node_type; i < USB_COMPAT_END; i++) { + for (j = 0; j < FSL_USB_ERRATUM_END; j++) { + if (erratum_tlb[i][j].has_fsl_usb_erratum != NULL) { + if (!erratum_tlb[i][j].has_fsl_usb_erratum()) + continue; + ret = fdt_setprop(blob, node_offset, + erratum_tlb[i][j].dt_set_prop, + NULL, 0); + if (ret < 0) { + printf("ERROR: could not set %s: %s.\n", + erratum_tlb[i][j].dt_set_prop, + fdt_strerror(ret)); + return ret; + } + } + } + } + return ret; +} - err = fdt_usb_get_node_type(blob, start_offset, - &node_offset, &node_type); - if (err < 0) - return err; +static int fsl_fdt_fixup_erratum(int node_offset, void *blob, + const char **node_type) +{ + int dt_node_type; + int ret; - if (!strcmp(node_type, FSL_USB2_MPH) || !strcmp(node_type, FSL_USB2_DR)) - node_name = CHIPIDEA_USB2; + if (!strcmp(*node_type, FSL_USB2_MPH)) + dt_node_type = USB2_MPH; + else if (!strcmp(*node_type, FSL_USB2_DR)) + dt_node_type = USB2_DR; + else if (!strcmp(*node_type, SNPS_DWC3)) + dt_node_type = SNPS; else - node_name = node_type; - if (strcmp(node_name, controller_type)) - return err; - - err = fdt_setprop(blob, node_offset, prop_erratum, NULL, 0); - if (err < 0) { - printf("ERROR: could not set %s for %s: %s.\n", - prop_erratum, node_type, fdt_strerror(err)); - } + return -ENOENT; - return node_offset; -} + ret = fsl_fdt_fixup_usb_erratum(node_offset, blob, dt_node_type); -static int fsl_fdt_fixup_erratum(int *usb_erratum_off, void *blob, - const char *controller_type, char *str, - bool (*has_erratum)(void)) -{ - char buf[32] = {0}; - - snprintf(buf, sizeof(buf), "fsl,usb-erratum-%s", str); - if (!has_erratum()) - return -EINVAL; - *usb_erratum_off = fsl_fdt_fixup_usb_erratum(blob, buf, controller_type, - *usb_erratum_off); - if (*usb_erratum_off < 0) - return -ENOSPC; - debug("Adding USB erratum %s\n", str); - return 0; + return ret; } void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd) { static const char * const modes[] = { "host", "peripheral", "otg" }; static const char * const phys[] = { "ulpi", "utmi", "utmi_dual" }; - int usb_erratum_a006261_off = -1; - int usb_erratum_a007075_off = -1; - int usb_erratum_a007792_off = -1; - int usb_erratum_a005697_off = -1; - int usb_erratum_a008751_off = -1; - int usb_mode_off = -1; - int usb_phy_off = -1; + const char *node_type = NULL; + int node_offset = -1; char str[5]; - int i, j; + int i = 1, j; int ret; - for (i = 1; i <= CONFIG_USB_MAX_CONTROLLER_COUNT; i++) { + do { const char *dr_mode_type = NULL; const char *dr_phy_type = NULL; int mode_idx = -1, phy_idx = -1; - snprintf(str, 5, "%s%d", "usb", i); + ret = fdt_usb_get_node_type(blob, node_offset, + &node_offset, &node_type); + if (ret < 0) + return; + + snprintf(str, 5, "%s%d", "usb", i++); if (hwconfig(str)) { for (j = 0; j < ARRAY_SIZE(modes); j++) { if (hwconfig_subarg_cmp(str, "dr_mode", @@ -185,45 +219,20 @@ void fsl_fdt_fixup_dr_usb(void *blob, bd_t *bd) if (has_dual_phy()) dr_phy_type = phys[2]; - usb_mode_off = fdt_fixup_usb_mode_phy_type(blob, - dr_mode_type, NULL, - usb_mode_off); - - if (usb_mode_off < 0) + ret = fdt_fixup_usb_mode_phy_type(blob, dr_mode_type, NULL, + node_offset, &node_type); + if (ret < 0) return; - usb_phy_off = fdt_fixup_usb_mode_phy_type(blob, - NULL, dr_phy_type, - usb_phy_off); - - if (usb_phy_off < 0) + ret = fdt_fixup_usb_mode_phy_type(blob, NULL, dr_phy_type, + node_offset, &node_type); + if (ret < 0) return; - ret = fsl_fdt_fixup_erratum(&usb_erratum_a006261_off, blob, - CHIPIDEA_USB2, "a006261", - has_erratum_a006261); - if (ret == -ENOSPC) - return; - ret = fsl_fdt_fixup_erratum(&usb_erratum_a007075_off, blob, - CHIPIDEA_USB2, "a007075", - has_erratum_a007075); - if (ret == -ENOSPC) - return; - ret = fsl_fdt_fixup_erratum(&usb_erratum_a007792_off, blob, - CHIPIDEA_USB2, "a007792", - has_erratum_a007792); - if (ret == -ENOSPC) - return; - ret = fsl_fdt_fixup_erratum(&usb_erratum_a005697_off, blob, - CHIPIDEA_USB2, "a005697", - has_erratum_a005697); - if (ret == -ENOSPC) - return; - ret = fsl_fdt_fixup_erratum(&usb_erratum_a008751_off, blob, - SNPS_DWC3, "a008751", - has_erratum_a008751); - if (ret == -ENOSPC) - return; + ret = fsl_fdt_fixup_erratum(node_offset, blob, &node_type); + if (ret < 0) + printf("WARNING: USB dt fixup fail , %d\n", + fdt_strerror(ret)); - } + } while (node_offset > 0); } -- 2.1.0

3 4

[U-Boot] [PATCH] ARM64: zynqmp: Correct the sdhci minimum frequency for ep108
by Michal Simek 02 Nov '16

02 Nov '16

From: Siva Durga Prasad Paladugu <siva.durga.paladugu(a)xilinx.com> Correct the sdhci minimum frequency for ep platform. It should be right shift instead of left shift operand. Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- include/configs/xilinx_zynqmp_ep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/xilinx_zynqmp_ep.h b/include/configs/xilinx_zynqmp_ep.h index 8e4b96033b8c..d0ce768e6e14 100644 --- a/include/configs/xilinx_zynqmp_ep.h +++ b/include/configs/xilinx_zynqmp_ep.h @@ -14,7 +14,7 @@ #define __CONFIG_ZYNQMP_EP_H #define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 -#define CONFIG_ZYNQ_SDHCI_MIN_FREQ (CONFIG_ZYNQ_SDHCI_MAX_FREQ << 9) +#define CONFIG_ZYNQ_SDHCI_MIN_FREQ (CONFIG_ZYNQ_SDHCI_MAX_FREQ >> 9) #define CONFIG_ZYNQ_EEPROM #define CONFIG_SATA_CEVA #define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR, \ -- 1.9.1

1 0

[U-Boot] Device tree & PCI/ECAM questions
by Aaron Williams 02 Nov '16

02 Nov '16

Hi all, I am working on several drivers for our Octeon-TX/Thunder chips which talk to devices connected to the ECAM bus through another sub-bus and am having issues regarding the device tree. We have a "PCI" driver to handle the ECAM and I created a simple-bus stub for our MRML bus which connects low-speed devices to the ECAM bus and all of the devices show up in the device tree. My problem is that the devices also enumerated via PCI. I have something like the following: static int cavium_pci_mmc_probe(struct udevice *dev) { debug("%s: Entry\n", __func__); pci_dev_t bdf = dm_pci_get_bdf(dev); struct cavium_mmc_host *host = dev_get_priv(dev); size_t size; uint64_t base_addr = dm_pci_map_bar(dev, 0, &size, PCI_REGION_MEM); int rc = 0; host->base_addr = base_addr; dev->req_seq = PCI_FUNC(bdf); debug("%s(%s): ", __func__, dev->name); debug(" platdata: %p\n" " parent platdata: %p\n" " uclass platdata: %p\n" " base address: %lx\n" " of_offset: %d\n" " parent: %p\n" " priv: %p\n" " uclass: %p\n" " req_seq: %d\n" " seq: %d\n", dev->platdata, dev->parent_platdata, dev->uclass_platdata, base_addr, dev->of_offset, dev->parent, dev->priv, dev->uclass, dev->req_seq, dev->seq); if (dev->of_offset >= 0) rc = process_node(dev, gd->fdt_blob, dev->of_offset); return rc; } static const struct udevice_id cavium_mmc_ids[] = { { .compatible = "cavium,thunder-8890-mmc" }, { .compatible = "cavium,mmc" }, { }, }; static const struct udevice_id cavium_mmc_slot_ids[] = { { .compatible = "cavium,thunder-8890-mmc-slot" }, { }, }; U_BOOT_DRIVER(cavium_pci_mmc) = { .name = "mmc_cavium", .id = UCLASS_MMC, .of_match = of_match_ptr(cavium_mmc_ids), .ofdata_to_platdata = cavium_mmc_ofdata_to_platdata, .probe = cavium_pci_mmc_probe, .priv_auto_alloc_size = sizeof(struct cavium_mmc_host), .ops = NULL, }; static struct pci_device_id cavium_pci_mmc_supported[] = { { PCI_VDEVICE(CAVIUM, PCI_DEVICE_ID_THUNDER_MMC) }, {}, }; U_BOOT_PCI_DEVICE(cavium_pci_mmc, cavium_pci_mmc_supported); The problem I'm seeing is that in the probe function the of_offset field is always -1. Shouldn't it resolve this information via the compatible string in the device tree? How should I go about setting it up so that not only things like the base address get resolved but also the of_offset field since all of the slot configuration comes from the device tree. In our case we have a single MMC device on the MRML bus connected to the ECAM bus (which looks like a PCI bus) which supports multiple slots with one set of registers. -Aaron -- Aaron Williams Software Engineer Cavium, Inc. (408) 943-7198 (510) 789-8988 (cell)

2 2

[U-Boot] [PATCH] cmd: crosec: Move crosec_decode_region helper to cmd/cros_ec.c
by Moritz Fischer 02 Nov '16

02 Nov '16

The cros_ec_decode_region() function is only used in combination with the crosec cmds. Move the function to the correct place. Signed-off-by: Moritz Fischer <moritz.fischer(a)ettus.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: Masahiro Yamada <yamada.masahiro(a)socionext.com> Cc: u-boot(a)lists.denx.de --- cmd/cros_ec.c | 16 ++++++++++++++++ drivers/misc/cros_ec.c | 16 ---------------- include/cros_ec.h | 9 --------- 3 files changed, 16 insertions(+), 25 deletions(-) diff --git a/cmd/cros_ec.c b/cmd/cros_ec.c index abf11f0..3a45149 100644 --- a/cmd/cros_ec.c +++ b/cmd/cros_ec.c @@ -19,6 +19,22 @@ static const char * const ec_current_image_name[] = {"unknown", "RO", "RW"}; DECLARE_GLOBAL_DATA_PTR; +int cros_ec_decode_region(int argc, char * const argv[]) +{ + if (argc > 0) { + if (0 == strcmp(*argv, "rw")) + return EC_FLASH_REGION_RW; + else if (0 == strcmp(*argv, "ro")) + return EC_FLASH_REGION_RO; + + debug("%s: Invalid region '%s'\n", __func__, *argv); + } else { + debug("%s: Missing region parameter\n", __func__); + } + + return -1; +} + /** * Perform a flash read or write command * diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 9159498..cf851ff 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -1070,22 +1070,6 @@ int cros_ec_register(struct udevice *dev) return 0; } -int cros_ec_decode_region(int argc, char * const argv[]) -{ - if (argc > 0) { - if (0 == strcmp(*argv, "rw")) - return EC_FLASH_REGION_RW; - else if (0 == strcmp(*argv, "ro")) - return EC_FLASH_REGION_RO; - - debug("%s: Invalid region '%s'\n", __func__, *argv); - } else { - debug("%s: Missing region parameter\n", __func__); - } - - return -1; -} - int cros_ec_decode_ec_flash(const void *blob, int node, struct fdt_cros_ec *config) { diff --git a/include/cros_ec.h b/include/cros_ec.h index f280c1d..26b4680 100644 --- a/include/cros_ec.h +++ b/include/cros_ec.h @@ -252,15 +252,6 @@ void cros_ec_dump_data(const char *name, int cmd, const uint8_t *data, int len); */ int cros_ec_calc_checksum(const uint8_t *data, int size); -/** - * Decode a flash region parameter - * - * @param argc Number of params remaining - * @param argv List of remaining parameters - * @return flash region (EC_FLASH_REGION_...) or -1 on error - */ -int cros_ec_decode_region(int argc, char * const argv[]); - int cros_ec_flash_erase(struct cros_ec_dev *dev, uint32_t offset, uint32_t size); -- 2.7.4

2 1

[U-Boot] [PATCH 00/11] sunxi: Add full SPL support for sun9i (A80)
by Chen-Yu Tsai 02 Nov '16

02 Nov '16

Hi everyone, This series adds full SPL with DRAM initialization for sun9i (A80). The bulk of the work was done by the people at Theobroma Systems. Their work can be found here: https://git.theobroma-systems.com/armadillo-u-boot.git/ I picked the essential patches and cleaned them up a bit more, and added commit messages if they were missing. As the DRAM bits are essentially a code dump with some cleanups and some bits disabled, expect many warnings. Checkpatch is still not happy with it. I've tested the series on both my A80 boards, which I've added defconfigs for in the last 2 patches. My A80 Optimus does not boot from micro SD, so I'm still FEL booting that one. But my Cubieboard 4 is now standalone. As usual, please have a look, test if possible. Regards ChenYu Chen-Yu Tsai (5): sunxi: Set default CPU clock rate to 1008 MHz for sun9i (A80) sunxi: Add support for SID e-fuses on sun9i sunxi: Add default zq value for sun9i (A80) sunxi: Add support for A80 Optimus board sunxi: Add support for Cubieboard4 Philipp Tomsich (6): sunxi: DRAM initialisation for sun9i sunxi: add gtbus-initialisation for sun9i sunxi: Enable SMP mode for the boot CPU on sun9i (A80) sunxi: add initial clock setup for sun9i for SPL sunxi: enable SPL for sun9i sunxi: add MMC pinmux setup for SDC2 on sun9i arch/arm/include/asm/arch-sunxi/clock_sun9i.h | 116 ++- arch/arm/include/asm/arch-sunxi/cpu_sun9i.h | 10 + arch/arm/include/asm/arch-sunxi/dram.h | 2 + arch/arm/include/asm/arch-sunxi/dram_sun9i.h | 275 +++++++ arch/arm/include/asm/arch-sunxi/gtbus.h | 21 + arch/arm/include/asm/arch-sunxi/gtbus_sun9i.h | 89 +++ arch/arm/mach-sunxi/Makefile | 2 + arch/arm/mach-sunxi/board.c | 3 +- arch/arm/mach-sunxi/clock.c | 6 + arch/arm/mach-sunxi/clock_sun9i.c | 146 +++- arch/arm/mach-sunxi/dram_sun9i.c | 1059 +++++++++++++++++++++++++ arch/arm/mach-sunxi/gtbus_sun9i.c | 48 ++ board/sunxi/Kconfig | 10 +- board/sunxi/MAINTAINERS | 10 + board/sunxi/board.c | 7 + configs/A80_Optimus_defconfig | 18 + configs/Cubieboard4_defconfig | 18 + 17 files changed, 1818 insertions(+), 22 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/dram_sun9i.h create mode 100644 arch/arm/include/asm/arch-sunxi/gtbus.h create mode 100644 arch/arm/include/asm/arch-sunxi/gtbus_sun9i.h create mode 100644 arch/arm/mach-sunxi/dram_sun9i.c create mode 100644 arch/arm/mach-sunxi/gtbus_sun9i.c create mode 100644 configs/A80_Optimus_defconfig create mode 100644 configs/Cubieboard4_defconfig -- 2.9.3

3 24

[U-Boot] [PATCH] odroid-c2: Enable distro boot
by Andreas Färber 01 Nov '16

01 Nov '16

Use the generic "distro" boot framework to enable automatic DHCP boot. Signed-off-by: Andreas Färber <afaerber(a)suse.de> --- Kconfig | 2 +- configs/odroid-c2_defconfig | 1 - include/configs/meson-gxbb-common.h | 13 +++++++++++++ include/configs/odroid-c2.h | 2 ++ 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Kconfig b/Kconfig index 1263d0b..3c085cf 100644 --- a/Kconfig +++ b/Kconfig @@ -55,7 +55,7 @@ config CC_OPTIMIZE_FOR_SIZE config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" - default y if ARCH_SUNXI + default y if ARCH_MESON || ARCH_SUNXI default n select CMD_BOOTZ if ARM && !ARM64 select CMD_BOOTI if ARM64 diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 9db718c..dfc19d9 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -12,7 +12,6 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index 3bba2e6..0c467fe 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -40,4 +40,17 @@ #include <config_distro_defaults.h> +#define BOOT_TARGET_DEVICES(func) \ + func(DHCP, dhcp, na) +#include <config_distro_bootcmd.h> + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_addr_r=0x01000000\0" \ + "scriptaddr=0x1f000000\0" \ + "kernel_addr_r=0x20000000\0" \ + "pxefile_addr_r=0x20000000\0" \ + "ramdisk_addr_r=0x28000000\0" \ + MESON_FDTFILE_SETTING \ + BOOTENV + #endif /* __MESON_GXBB_COMMON_CONFIG_H */ diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index 1d5b3d5..bf7e1af 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -12,6 +12,8 @@ #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE 115200 +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" + #include <configs/meson-gxbb-common.h> #endif /* __CONFIG_H */ -- 2.6.6

2 2