Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package u-boot
Version 2014.10+dfsg1-2 of u-boot fixes support for some boards(Cubox
i2/Hummingboard i2), improves compatibility with debian-installer boot
scripts (Cubox-i/Wandboard), and updates documentation for using u-boot
on several armhf platforms.
Specifically, CuBox i2 and Hummingboard i2eX (which uses the mx6_cubox-i
target as well) are fixed, which resulted in at least one patch being
merged into cubox-i-support.diff.
It also improves compatibility with debian-installer hd-media target on
the wandboard and cubox-i platforms by setting several variables used in
the boot script. On cubox-i, the detecting which device tree (dtb) to
load was set to run before the boot script, and importing the boot
environment before loading the boot script to work around issues with
hd-media's boot script handling for console support.
README.Debian was updated with information about new platforms and split
into the corresponding packages (u-boot, u-boot-imx, u-boot-omap,
u-boot-sunxi), which was previously only shipped in u-boot (which on
armhf is effectively a metapackage pulling in all the armhf platforms).
I did relocate one patch related to the wandboard
(wandboard-uEnv.txt-bootz-n-fixes.patch) grouping it together with other
wandboard related patches in debian/patches, which arguably wasn't
strictly necessary. Apologies for the extra noise that resulted from
that.
README.Debian | 29
changelog | 18
patches/0001-wandboard-uEnv.txt-bootz-n-fixes.patch | 103 --
patches/cubox-i/Switch-mx6_cubox-i-to-Kconfig.patch | 92 --
patches/cubox-i/cubox-i-standardize-variables.diff | 26
patches/cubox-i/cubox-i-support.diff | 435 +++++++---
patches/cubox-i/emulate-config_distro_bootcmd-standardization.diff | 19
patches/cubox-i/imx6-spl-support.diff | 61 -
patches/cubox-i/spl-sata-support.diff | 4
patches/cubox-i/steal-board-eth-init-from-hummingboard.diff | 4
patches/series | 11
patches/wandboard/emulate-config_distro_bootcmd-standardization.diff | 19
patches/wandboard/wandboard-standardized-variables | 20
patches/wandboard/wandboard-uEnv.txt-bootz-n-fixes.patch | 103 ++
u-boot-imx.README.Debian | 20
u-boot-omap.README.Debian | 13
u-boot-sunxi.README.Debian | 11
u-boot.README.Debian | 25
18 files changed, 659 insertions(+), 354 deletions(-)
diff -Nru u-boot-2014.10+dfsg1/debian/changelog u-boot-2014.10+dfsg1/debian/changelog
--- u-boot-2014.10+dfsg1/debian/changelog 2014-10-19 11:34:54.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/changelog 2014-11-01 16:38:54.000000000 -0700
@@ -1,3 +1,21 @@
+u-boot (2014.10+dfsg1-2) unstable; urgency=medium
+
+ [ Steve Langasek ]
+ * Resync cubox-i patches with github.
+ - fixes support for booting on the cubox-i2ultra/i2ex.
+ (Closes: #766266)
+
+ [ Vagrant Cascadian ]
+ * wandboard, cubox-i: Add patches to use variables expected by
+ debian-installer bootscript.
+ * cubox-i: Move importing bootenv before loading the boot script, to
+ allow environment variables useful to the boot script to be set.
+ * cubox-i: Run autodetectfdt before attempting to load the boot script.
+ * Split README.Debian by subarchitecture, and document installing u-boot
+ on several additional boards.
+
+ -- Vagrant Cascadian <vagrant@debian.org> Sat, 01 Nov 2014 16:33:33 -0700
+
u-boot (2014.10+dfsg1-1) unstable; urgency=medium
[ Vagrant Cascadian ]
diff -Nru u-boot-2014.10+dfsg1/debian/patches/0001-wandboard-uEnv.txt-bootz-n-fixes.patch u-boot-2014.10+dfsg1/debian/patches/0001-wandboard-uEnv.txt-bootz-n-fixes.patch
--- u-boot-2014.10+dfsg1/debian/patches/0001-wandboard-uEnv.txt-bootz-n-fixes.patch 2014-10-15 10:41:53.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/patches/0001-wandboard-uEnv.txt-bootz-n-fixes.patch 1969-12-31 16:00:00.000000000 -0800
@@ -1,103 +0,0 @@
-Downloaded from:
-
- https://raw.github.com/eewiki/u-boot-patches/master/v2014.01/0001-wandboard-uEnv.txt-bootz-n-fixes.patch
-
-Modified to reduce diff with upstream:
-- keep the default bootdelay.
-- keep support for bootscripts.
-- consistantly use "load" vs. "fatload".
-
-From d0bf1e44422e4102859d9420a8abf42c3600f500 Mon Sep 17 00:00:00 2001
-From: Robert Nelson <robertcnelson@gmail.com>
-Date: Thu, 23 Jan 2014 16:24:13 -0600
-Subject: [PATCH] wandboard: uEnv.txt, bootz, n fixes
-
-Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
----
- include/configs/wandboard.h | 56 +++++++++++++++++++++++++++++++--------------
- 1 file changed, 39 insertions(+), 17 deletions(-)
-
-Index: u-boot/include/configs/wandboard.h
-===================================================================
---- u-boot.orig/include/configs/wandboard.h
-+++ u-boot/include/configs/wandboard.h
-@@ -76,6 +76,8 @@
- #define CONFIG_BOUNCE_BUFFER
- #define CONFIG_CMD_EXT2
- #define CONFIG_CMD_FAT
-+#define CONFIG_CMD_EXT4
-+#define CONFIG_CMD_FS_GENERIC
- #define CONFIG_DOS_PARTITION
-
- /* Ethernet Configuration */
-@@ -172,12 +174,16 @@
- "echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \
- "fi; " \
- "setenv bootargs ${bootargs} ${fbmem}\0" \
-+ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt\0" \
-+ "importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
-+ "env import -t $loadaddr $filesize\0" \
- "loadbootscript=" \
-- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
-+ "load 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" \
-+ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
-+ "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
-+ "loadfdt=load 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 " \
-@@ -219,16 +225,32 @@
- "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"
-+ "mmc dev ${mmcdev};" \
-+ "if mmc rescan; then " \
-+ "echo SD/MMC found on device ${mmcdev};" \
-+ "if run loadbootenv; then " \
-+ "run importbootenv;" \
-+ "fi;" \
-+ "echo Checking if uenvcmd is set ...;" \
-+ "if test -n $uenvcmd; then " \
-+ "echo Running uenvcmd ...;" \
-+ "run uenvcmd;" \
-+ "fi;" \
-+ "if run loadbootscript; then " \
-+ "echo Running boot script ${script} ...;" \
-+ "run bootscript; " \
-+ "fi;" \
-+ "setenv script /boot/${script};" \
-+ "if run loadbootscript; then " \
-+ "echo Running boot script ${script} ...;" \
-+ "run bootscript; " \
-+ "fi;" \
-+ "echo Running default loadzimage ...;" \
-+ "if run loadzimage; then " \
-+ "run loadfdt;" \
-+ "run mmcboot;" \
-+ "fi;" \
-+ "fi;"
-
- /* Miscellaneous configurable options */
- #define CONFIG_SYS_LONGHELP
-@@ -269,6 +291,7 @@
-
- #define CONFIG_OF_LIBFDT
- #define CONFIG_CMD_BOOTZ
-+#define CONFIG_SUPPORT_RAW_INITRD
-
- #ifndef CONFIG_SYS_DCACHE_OFF
- #define CONFIG_CMD_CACHE
diff -Nru u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-standardize-variables.diff u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-standardize-variables.diff
--- u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-standardize-variables.diff 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-standardize-variables.diff 2014-11-01 15:17:22.000000000 -0700
@@ -0,0 +1,26 @@
+Add compatibility variables defined in README for kernel_addr_r,
+fdt_addr_r, ramdisk_addr_r and fdtfile.
+
+Index: u-boot/include/configs/mx6_cubox-i.h
+===================================================================
+--- u-boot.orig/include/configs/mx6_cubox-i.h
++++ u-boot/include/configs/mx6_cubox-i.h
+@@ -170,6 +170,9 @@
+ "initrd_high=0xffffffff\0" \
+ "fdt_addr=0x18000000\0" \
+ "ramdiskaddr=0x11800000\0" \
++ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
++ "fdt_addr_r=0x18000000\0" \
++ "ramdisk_addr_r=0x11800000\0" \
+ "ramdisk=uInitrd\0" \
+ "boot_fdt=try\0" \
+ "ip_dyn=yes\0" \
+@@ -205,7 +208,7 @@
+ "setenv fdt_file ${fdt_prefix}-cubox-i.dtb; " \
+ "else " \
+ "setenv fdt_file ${fdt_prefix}-hummingboard.dtb; " \
+- "fi;\0" \
++ "fi; setenv fdtfile ${fdt_file};\0" \
+ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${bootenv};\0" \
+ "loadfdt=if test ${boottype} = mmc; then " \
+ "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${file_prefix}${fdt_file}; " \
diff -Nru u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-support.diff u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-support.diff
--- u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-support.diff 2014-10-15 10:42:25.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/patches/cubox-i/cubox-i-support.diff 2014-11-01 16:32:05.000000000 -0700
@@ -3,11 +3,59 @@
Description: SolidRun CuBox-i support
Taken from https://github.com/rabeeh/u-boot-imx6.git
-Index: u-boot/arch/arm/cpu/armv7/mx6/soc.c
-===================================================================
---- u-boot.orig/arch/arm/cpu/armv7/mx6/soc.c
-+++ u-boot/arch/arm/cpu/armv7/mx6/soc.c
-@@ -409,6 +409,9 @@ void imx_enable_hdmi_phy(void)
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index 72558b8..c6c526a 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -414,6 +414,12 @@ config TARGET_GW_VENTANA
+ config TARGET_HUMMINGBOARD
+ bool "Support hummingboard"
+
++config TARGET_MX6_C1
++ bool "Support mx6_c1"
++
++config TARGET_MX6_CUBOX_I
++ bool "Support mx6_cubox-i"
++
+ config TARGET_TQMA6
+ bool "TQ Systems TQMa6 board"
+
+@@ -671,6 +677,8 @@ source "board/siemens/rut/Kconfig"
+ source "board/siemens/taurus/Kconfig"
+ source "board/silica/pengwyn/Kconfig"
+ source "board/solidrun/hummingboard/Kconfig"
++source "board/solidrun/mx6_c1/Kconfig"
++source "board/solidrun/mx6_cubox-i/Kconfig"
+ source "board/spear/spear300/Kconfig"
+ source "board/spear/spear310/Kconfig"
+ source "board/spear/spear320/Kconfig"
+diff --git a/arch/arm/cpu/armv7/mx6/soc.c b/arch/arm/cpu/armv7/mx6/soc.c
+index 6352422..8079840 100644
+--- a/arch/arm/cpu/armv7/mx6/soc.c
++++ b/arch/arm/cpu/armv7/mx6/soc.c
+@@ -389,10 +389,17 @@ void s_init(void)
+ (periph2 != 0x3) && (periph1 != 0x3))
+ mask528 |= ANATOP_PFD_CLKGATE_MASK(2);
+
+- writel(mask480, &anatop->pfd_480_set);
+- writel(mask528, &anatop->pfd_528_set);
+- writel(mask480, &anatop->pfd_480_clr);
+- writel(mask528, &anatop->pfd_528_clr);
++ reg = readl(&anatop->pfd_480);
++ if (!(reg & ((1 << 6) | (1 << 14) | (1 << 22)))) {
++ writel(mask480, &anatop->pfd_480_set);
++ writel(mask480, &anatop->pfd_480_clr);
++ }
++
++ reg = readl(&anatop->pfd_528);
++ if (!(reg & ((1 << 6) | (1 << 14) | (1 << 22)))) {
++ writel(mask528, &anatop->pfd_528_set);
++ writel(mask528, &anatop->pfd_528_clr);
++ }
+ }
+
+ #ifdef CONFIG_IMX_HDMI
+@@ -409,6 +416,9 @@ void imx_enable_hdmi_phy(void)
udelay(3000);
reg |= HDMI_PHY_CONF0_GEN2_TXPWRON_MASK;
writeb(reg, &hdmi->phy_conf0);
@@ -17,10 +65,11 @@
writeb(HDMI_MC_PHYRSTZ_ASSERT, &hdmi->mc_phyrstz);
}
-Index: u-boot/board/solidrun/mx6-microsom/1066mhz_4x128mx16.cfg
-===================================================================
+diff --git a/board/solidrun/mx6-microsom/1066mhz_4x128mx16.cfg b/board/solidrun/mx6-microsom/1066mhz_4x128mx16.cfg
+new file mode 100644
+index 0000000..19da53e
--- /dev/null
-+++ u-boot/board/solidrun/mx6-microsom/1066mhz_4x128mx16.cfg
++++ b/board/solidrun/mx6-microsom/1066mhz_4x128mx16.cfg
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
@@ -125,10 +174,11 @@
+DATA 4, MX6_MMDC_P1_MPODTCTRL, 0x00000007
+DATA 4, MX6_MMDC_P0_MDSCR, 0x00000000
+DATA 4, MX6_MMDC_P0_MAPSR, 0x00011006
-Index: u-boot/board/solidrun/mx6-microsom/1066mhz_4x256mx16.cfg
-===================================================================
+diff --git a/board/solidrun/mx6-microsom/1066mhz_4x256mx16.cfg b/board/solidrun/mx6-microsom/1066mhz_4x256mx16.cfg
+new file mode 100644
+index 0000000..0800afc
--- /dev/null
-+++ u-boot/board/solidrun/mx6-microsom/1066mhz_4x256mx16.cfg
++++ b/board/solidrun/mx6-microsom/1066mhz_4x256mx16.cfg
@@ -0,0 +1,103 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
@@ -233,10 +283,11 @@
+DATA 4, MX6_MMDC_P1_MPODTCTRL, 0x00000007
+DATA 4, MX6_MMDC_P0_MDSCR, 0x00000000
+DATA 4, MX6_MMDC_P0_MAPSR, 0x00011006
-Index: u-boot/board/solidrun/mx6-microsom/800mhz_4x128mx16.cfg
-===================================================================
+diff --git a/board/solidrun/mx6-microsom/800mhz_4x128mx16.cfg b/board/solidrun/mx6-microsom/800mhz_4x128mx16.cfg
+new file mode 100644
+index 0000000..0dea747
--- /dev/null
-+++ u-boot/board/solidrun/mx6-microsom/800mhz_4x128mx16.cfg
++++ b/board/solidrun/mx6-microsom/800mhz_4x128mx16.cfg
@@ -0,0 +1,99 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
@@ -337,10 +388,32 @@
+DATA 4, MX6_MMDC_P0_MDPDC, 0x0002556d
+DATA 4, MX6_MMDC_P0_MAPSR, 0x00011006
+DATA 4, MX6_MMDC_P0_MDSCR, 0x00000000
-Index: u-boot/board/solidrun/mx6-microsom/ddr-1066mhz-64bit-setup.cfg
-===================================================================
+diff --git a/board/solidrun/mx6-microsom/clocks.cfg b/board/solidrun/mx6-microsom/clocks.cfg
+index 1288811..d579eef 100644
+--- a/board/solidrun/mx6-microsom/clocks.cfg
++++ b/board/solidrun/mx6-microsom/clocks.cfg
+@@ -4,6 +4,16 @@
+ * Copyright (C) 2013 Jon Nettleton <jon.nettleton@gmail.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
++ *
++ * Device Configuration Data (DCD)
++ *
++ * Each entry must have the format:
++ * Addr-type Address Value
++ *
++ * where:
++ * Addr-type register length (1,2 or 4 bytes)
++ * Address absolute address of the register
++ * value value to be stored in the register
+ */
+
+ /* set the default clock gate to save power */
+diff --git a/board/solidrun/mx6-microsom/ddr-1066mhz-64bit-setup.cfg b/board/solidrun/mx6-microsom/ddr-1066mhz-64bit-setup.cfg
+new file mode 100644
+index 0000000..1a8af4e
--- /dev/null
-+++ u-boot/board/solidrun/mx6-microsom/ddr-1066mhz-64bit-setup.cfg
++++ b/board/solidrun/mx6-microsom/ddr-1066mhz-64bit-setup.cfg
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
@@ -443,10 +516,11 @@
+DATA 4, MX6_IOM_DRAM_DQM5, 0x00020030
+DATA 4, MX6_IOM_DRAM_DQM6, 0x00020030
+DATA 4, MX6_IOM_DRAM_DQM7, 0x00020030
-Index: u-boot/board/solidrun/mx6-microsom/ddr-800mhz-64bit-setup.cfg
-===================================================================
+diff --git a/board/solidrun/mx6-microsom/ddr-800mhz-64bit-setup.cfg b/board/solidrun/mx6-microsom/ddr-800mhz-64bit-setup.cfg
+new file mode 100644
+index 0000000..a7a372d
--- /dev/null
-+++ u-boot/board/solidrun/mx6-microsom/ddr-800mhz-64bit-setup.cfg
++++ b/board/solidrun/mx6-microsom/ddr-800mhz-64bit-setup.cfg
@@ -0,0 +1,100 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
@@ -548,10 +622,40 @@
+DATA 4, MX6_IOM_DRAM_DQM5, 0x00000028
+DATA 4, MX6_IOM_DRAM_DQM6, 0x00000028
+DATA 4, MX6_IOM_DRAM_DQM7, 0x00000028
-Index: u-boot/board/solidrun/mx6_c1/Makefile
-===================================================================
+diff --git a/board/solidrun/mx6_c1/Kconfig b/board/solidrun/mx6_c1/Kconfig
+new file mode 100644
+index 0000000..4db29bb
--- /dev/null
-+++ u-boot/board/solidrun/mx6_c1/Makefile
++++ b/board/solidrun/mx6_c1/Kconfig
+@@ -0,0 +1,23 @@
++if TARGET_MX6_C1
++
++config SYS_CPU
++ string
++ default "armv7"
++
++config SYS_BOARD
++ string
++ default "mx6_c1"
++
++config SYS_VENDOR
++ string
++ default "solidrun"
++
++config SYS_SOC
++ string
++ default "mx6"
++
++config SYS_CONFIG_NAME
++ string
++ default "mx6_c1"
++
++endif
+diff --git a/board/solidrun/mx6_c1/Makefile b/board/solidrun/mx6_c1/Makefile
+new file mode 100644
+index 0000000..b772936
+--- /dev/null
++++ b/board/solidrun/mx6_c1/Makefile
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2012-2013, Guennadi Liakhovetski <lg@denx.de>
@@ -576,10 +680,11 @@
+#
+
+obj-y := mx6_c1.o
-Index: u-boot/board/solidrun/mx6_c1/mx6_c1.c
-===================================================================
+diff --git a/board/solidrun/mx6_c1/mx6_c1.c b/board/solidrun/mx6_c1/mx6_c1.c
+new file mode 100644
+index 0000000..ef0b9e2
--- /dev/null
-+++ u-boot/board/solidrun/mx6_c1/mx6_c1.c
++++ b/board/solidrun/mx6_c1/mx6_c1.c
@@ -0,0 +1,340 @@
+/*
+ * Copyright (C) 2012 Freescale Semiconductor, Inc.
@@ -788,8 +893,8 @@
+int board_eth_init(bd_t *bis)
+{
+ int ret;
-+ struct iomuxc_base_regs *const iomuxc_regs
-+ = (struct iomuxc_base_regs *) IOMUXC_BASE_ADDR;
++ struct iomuxc *const iomuxc_regs
++ = (struct iomuxc *) IOMUXC_BASE_ADDR;
+ struct anatop_regs __iomem *anatop =
+ (struct anatop_regs __iomem *)ANATOP_BASE_ADDR;
+ u32 reg = 0;
@@ -921,10 +1026,11 @@
+
+ return 0;
+}
-Index: u-boot/board/solidrun/mx6_c1/mx6_c1_bootscript.txt
-===================================================================
+diff --git a/board/solidrun/mx6_c1/mx6_c1_bootscript.txt b/board/solidrun/mx6_c1/mx6_c1_bootscript.txt
+new file mode 100644
+index 0000000..c061885
--- /dev/null
-+++ u-boot/board/solidrun/mx6_c1/mx6_c1_bootscript.txt
++++ b/board/solidrun/mx6_c1/mx6_c1_bootscript.txt
@@ -0,0 +1,30 @@
+setenv bootargs enable_wait_mode=off
+setenv nextcon 0;
@@ -956,10 +1062,11 @@
+&& ${fs}load ${dtype} ${disk}:1 12800000 /boot/uramdisk.img
+&& bootm 10800000 12800000 ;
+echo "Error loading kernel image"
-Index: u-boot/board/solidrun/mx6_c1/mx6_c1d.cfg
-===================================================================
+diff --git a/board/solidrun/mx6_c1/mx6_c1d.cfg b/board/solidrun/mx6_c1/mx6_c1d.cfg
+new file mode 100644
+index 0000000..8211ac8
--- /dev/null
-+++ u-boot/board/solidrun/mx6_c1/mx6_c1d.cfg
++++ b/board/solidrun/mx6_c1/mx6_c1d.cfg
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
@@ -1007,10 +1114,11 @@
+#include "../mx6-microsom/ddr-1066mhz-64bit-setup.cfg"
+#include "../mx6-microsom/1066mhz_4x256mx16.cfg"
+#include "../mx6-microsom/clocks.cfg"
-Index: u-boot/board/solidrun/mx6_c1/mx6_c1dl.cfg
-===================================================================
+diff --git a/board/solidrun/mx6_c1/mx6_c1dl.cfg b/board/solidrun/mx6_c1/mx6_c1dl.cfg
+new file mode 100644
+index 0000000..33eddd4
--- /dev/null
-+++ u-boot/board/solidrun/mx6_c1/mx6_c1dl.cfg
++++ b/board/solidrun/mx6_c1/mx6_c1dl.cfg
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
@@ -1058,10 +1166,11 @@
+#include "../mx6-microsom/ddr-800mhz-64bit-setup.cfg"
+#include "../mx6-microsom/800mhz_4x128mx16.cfg"
+#include "../mx6-microsom/clocks.cfg"
-Index: u-boot/board/solidrun/mx6_c1/mx6_c1q.cfg
-===================================================================
+diff --git a/board/solidrun/mx6_c1/mx6_c1q.cfg b/board/solidrun/mx6_c1/mx6_c1q.cfg
+new file mode 100644
+index 0000000..8211ac8
--- /dev/null
-+++ u-boot/board/solidrun/mx6_c1/mx6_c1q.cfg
++++ b/board/solidrun/mx6_c1/mx6_c1q.cfg
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
@@ -1109,10 +1218,11 @@
+#include "../mx6-microsom/ddr-1066mhz-64bit-setup.cfg"
+#include "../mx6-microsom/1066mhz_4x256mx16.cfg"
+#include "../mx6-microsom/clocks.cfg"
-Index: u-boot/board/solidrun/mx6_c1/mx6_c1solo.cfg
-===================================================================
+diff --git a/board/solidrun/mx6_c1/mx6_c1solo.cfg b/board/solidrun/mx6_c1/mx6_c1solo.cfg
+new file mode 100644
+index 0000000..8acb5ba
--- /dev/null
-+++ u-boot/board/solidrun/mx6_c1/mx6_c1solo.cfg
++++ b/board/solidrun/mx6_c1/mx6_c1solo.cfg
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2013 Boundary Devices
@@ -1160,10 +1270,52 @@
+#include "../mx6-microsom/ddr-800mhz-32bit-setup.cfg"
+#include "../mx6-microsom/800mhz_2x128mx16.cfg"
+#include "../mx6-microsom/clocks.cfg"
-Index: u-boot/board/solidrun/mx6_cubox-i/Makefile
-===================================================================
+diff --git a/board/solidrun/mx6_cubox-i/Kconfig b/board/solidrun/mx6_cubox-i/Kconfig
+new file mode 100644
+index 0000000..c4ec8fb
--- /dev/null
-+++ u-boot/board/solidrun/mx6_cubox-i/Makefile
++++ b/board/solidrun/mx6_cubox-i/Kconfig
+@@ -0,0 +1,23 @@
++if TARGET_MX6_CUBOX_I
++
++config SYS_CPU
++ string
++ default "armv7"
++
++config SYS_BOARD
++ string
++ default "mx6_cubox-i"
++
++config SYS_VENDOR
++ string
++ default "solidrun"
++
++config SYS_SOC
++ string
++ default "mx6"
++
++config SYS_CONFIG_NAME
++ string
++ default "mx6_cubox-i"
++
++endif
+diff --git a/board/solidrun/mx6_cubox-i/MAINTAINERS b/board/solidrun/mx6_cubox-i/MAINTAINERS
+new file mode 100644
+index 0000000..36ddf06
+--- /dev/null
++++ b/board/solidrun/mx6_cubox-i/MAINTAINERS
+@@ -0,0 +1,6 @@
++MX6 CuBox-I BOARD
++M: Steve Langasek <vorlon@debian.org>
++S: Maintained
++F: board/solidrun/mx6_cubox-i/
++F: include/configs/mx6_cubox-i.h
++F: configs/mx6_cubox-i_defconfig
+diff --git a/board/solidrun/mx6_cubox-i/Makefile b/board/solidrun/mx6_cubox-i/Makefile
+new file mode 100644
+index 0000000..2de7a70
+--- /dev/null
++++ b/board/solidrun/mx6_cubox-i/Makefile
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2012-2013, Guennadi Liakhovetski <lg@denx.de>
@@ -1188,10 +1340,11 @@
+#
+
+obj-y := mx6_cubox-i.o mx6_cubox-i_spl.o
-Index: u-boot/board/solidrun/mx6_cubox-i/imx6image.cfg
-===================================================================
+diff --git a/board/solidrun/mx6_cubox-i/imx6image.cfg b/board/solidrun/mx6_cubox-i/imx6image.cfg
+new file mode 100644
+index 0000000..e9736fb
--- /dev/null
-+++ u-boot/board/solidrun/mx6_cubox-i/imx6image.cfg
++++ b/board/solidrun/mx6_cubox-i/imx6image.cfg
@@ -0,0 +1,28 @@
+/*
+ * Maintainer : Richard Hu <linuxfae@technexion.com>
@@ -1221,11 +1374,12 @@
+#include "asm/arch/crm_regs.h"
+
+#include "../mx6-microsom/clocks.cfg"
-Index: u-boot/board/solidrun/mx6_cubox-i/mx6_cubox-i.c
-===================================================================
+diff --git a/board/solidrun/mx6_cubox-i/mx6_cubox-i.c b/board/solidrun/mx6_cubox-i/mx6_cubox-i.c
+new file mode 100644
+index 0000000..8b1e2e3
--- /dev/null
-+++ u-boot/board/solidrun/mx6_cubox-i/mx6_cubox-i.c
-@@ -0,0 +1,483 @@
++++ b/board/solidrun/mx6_cubox-i/mx6_cubox-i.c
+@@ -0,0 +1,484 @@
+/*
+ * Copyright (C) 2012 Freescale Semiconductor, Inc.
+ * Copyright (C) 2013 SolidRun ltd.
@@ -1269,7 +1423,7 @@
+DECLARE_GLOBAL_DATA_PTR;
+
+#define MX6QDL_SET_PAD(p, q) \
-+ if (is_cpu_type(MXC_CPU_MX6Q)) \
++ if (is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) \
+ imx_iomux_v3_setup_pad(MX6Q_##p | q);\
+ else \
+ imx_iomux_v3_setup_pad(MX6DL_##p | q)
@@ -1315,6 +1469,7 @@
+ sdram_size = 512u * 1024 * 1024;
+ break;
+ case MXC_CPU_MX6Q:
++ case MXC_CPU_MX6D:
+ {
+ /* Read first the snoop control unit config register */
+ u32 scu_config = *(u32 *)(SCU_BASE_ADDR + 0x4);
@@ -1353,7 +1508,7 @@
+iomux_v3_cfg_t const key_row1[] = {
+ /* Following is only for sensing if it's CuBox-i or HummingBoard */
+ MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(UART_PAD_CTRL),
-+}
++};
+#endif
+
+static void setup_iomux_uart(void)
@@ -1504,8 +1659,8 @@
+int board_eth_init(bd_t *bis)
+{
+ int ret;
-+ struct iomuxc_base_regs *const iomuxc_regs
-+ = (struct iomuxc_base_regs *) IOMUXC_BASE_ADDR;
++ struct iomuxc *const iomuxc_regs
++ = (struct iomuxc *) IOMUXC_BASE_ADDR;
+ struct anatop_regs __iomem *anatop =
+ (struct anatop_regs __iomem *)ANATOP_BASE_ADDR;
+ u32 reg = 0;
@@ -1652,7 +1807,7 @@
+
+#if defined(CONFIG_MX6Q) || defined(CONFIG_MX6DL)
+iomux_v3_cfg_t const led_pads[] = {
-+ MX6_PAD_DISP0_DAT8__GPIO_4_29 | MUX_PAD_CTRL(UART_PAD_CTRL),
++ MX6_PAD_DISP0_DAT8__GPIO4_IO29 | MUX_PAD_CTRL(UART_PAD_CTRL),
+};
+#endif
+
@@ -1709,10 +1864,11 @@
+
+ return 0;
+}
-Index: u-boot/board/solidrun/mx6_cubox-i/mx6_cubox-i_bootscript.txt
-===================================================================
+diff --git a/board/solidrun/mx6_cubox-i/mx6_cubox-i_bootscript.txt b/board/solidrun/mx6_cubox-i/mx6_cubox-i_bootscript.txt
+new file mode 100644
+index 0000000..c061885
--- /dev/null
-+++ u-boot/board/solidrun/mx6_cubox-i/mx6_cubox-i_bootscript.txt
++++ b/board/solidrun/mx6_cubox-i/mx6_cubox-i_bootscript.txt
@@ -0,0 +1,30 @@
+setenv bootargs enable_wait_mode=off
+setenv nextcon 0;
@@ -1744,11 +1900,12 @@
+&& ${fs}load ${dtype} ${disk}:1 12800000 /boot/uramdisk.img
+&& bootm 10800000 12800000 ;
+echo "Error loading kernel image"
-Index: u-boot/board/solidrun/mx6_cubox-i/mx6_cubox-i_spl.c
-===================================================================
+diff --git a/board/solidrun/mx6_cubox-i/mx6_cubox-i_spl.c b/board/solidrun/mx6_cubox-i/mx6_cubox-i_spl.c
+new file mode 100644
+index 0000000..3a6c63f
--- /dev/null
-+++ u-boot/board/solidrun/mx6_cubox-i/mx6_cubox-i_spl.c
-@@ -0,0 +1,478 @@
++++ b/board/solidrun/mx6_cubox-i/mx6_cubox-i_spl.c
+@@ -0,0 +1,479 @@
+/*
+ * Author: Tungyi Lin <tungyilin1127@gmail.com>
+ *
@@ -2175,6 +2332,7 @@
+ spl_dram_init_mx6solo_512mb();
+ break;
+ case MXC_CPU_MX6Q:
++ case MXC_CPU_MX6D:
+ {
+ /* Read first the snoop control unit config register */
+ u32 scu_config = *(u32 *)(SCU_BASE_ADDR + 0x4);
@@ -2227,11 +2385,93 @@
+}
+#endif
+
-Index: u-boot/drivers/net/fec_mxc.c
-===================================================================
---- u-boot.orig/drivers/net/fec_mxc.c
-+++ u-boot/drivers/net/fec_mxc.c
-@@ -125,8 +125,10 @@ static int fec_mdio_read(struct ethernet
+diff --git a/configs/mx6_c1d_defconfig b/configs/mx6_c1d_defconfig
+new file mode 100644
+index 0000000..86d172a
+--- /dev/null
++++ b/configs/mx6_c1d_defconfig
+@@ -0,0 +1,3 @@
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/mx6_c1/mx6_c1d.cfg,MX6Q,DDR_MB=1024"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_MX6_C1=y
+diff --git a/configs/mx6_c1dl_defconfig b/configs/mx6_c1dl_defconfig
+new file mode 100644
+index 0000000..4574534
+--- /dev/null
++++ b/configs/mx6_c1dl_defconfig
+@@ -0,0 +1,3 @@
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/mx6_c1/mx6_c1dl.cfg,MX6DL,DDR_MB=1024"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_MX6_C1=y
+diff --git a/configs/mx6_c1q_defconfig b/configs/mx6_c1q_defconfig
+new file mode 100644
+index 0000000..7e52f33
+--- /dev/null
++++ b/configs/mx6_c1q_defconfig
+@@ -0,0 +1,3 @@
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/mx6_c1/mx6_c1q.cfg,MX6Q,DDR_MB=2048"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_MX6_C1=y
+diff --git a/configs/mx6_c1solo_defconfig b/configs/mx6_c1solo_defconfig
+new file mode 100644
+index 0000000..99376aa
+--- /dev/null
++++ b/configs/mx6_c1solo_defconfig
+@@ -0,0 +1,3 @@
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/mx6_c1/mx6_c1solo.cfg,MX6S,DDR_MB=512"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_MX6_C1=y
+diff --git a/configs/mx6_cubox-i1_defconfig b/configs/mx6_cubox-i1_defconfig
+new file mode 100644
+index 0000000..c3d3c9c
+--- /dev/null
++++ b/configs/mx6_cubox-i1_defconfig
+@@ -0,0 +1,3 @@
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/mx6_c1/mx6_c1solo.cfg,MX6S,DDR_MB=512"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_MX6_CUBOX_I=y
+diff --git a/configs/mx6_cubox-i2_defconfig b/configs/mx6_cubox-i2_defconfig
+new file mode 100644
+index 0000000..10700c7
+--- /dev/null
++++ b/configs/mx6_cubox-i2_defconfig
+@@ -0,0 +1,3 @@
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/mx6_c1/mx6_c1dl.cfg,MX6DL,DDR_MB=1024"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_MX6_CUBOX_I=y
+diff --git a/configs/mx6_cubox-i2ultra_defconfig b/configs/mx6_cubox-i2ultra_defconfig
+new file mode 100644
+index 0000000..a51320e
+--- /dev/null
++++ b/configs/mx6_cubox-i2ultra_defconfig
+@@ -0,0 +1,3 @@
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/mx6_c1/mx6_c1d.cfg,MX6Q,DDR_MB=1024"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_MX6_CUBOX_I=y
+diff --git a/configs/mx6_cubox-i4pro_defconfig b/configs/mx6_cubox-i4pro_defconfig
+new file mode 100644
+index 0000000..8f95084
+--- /dev/null
++++ b/configs/mx6_cubox-i4pro_defconfig
+@@ -0,0 +1,3 @@
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/mx6_c1/mx6_c1q.cfg,MX6Q,DDR_MB=2048"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_MX6_CUBOX_I=y
+diff --git a/configs/mx6_cubox-i_defconfig b/configs/mx6_cubox-i_defconfig
+new file mode 100644
+index 0000000..8116ec1
+--- /dev/null
++++ b/configs/mx6_cubox-i_defconfig
+@@ -0,0 +1,4 @@
++CONFIG_SPL=y
++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/mx6_cubox-i/imx6image.cfg,MX6QDL,FSL_ENV_IN_MMC"
+++S:CONFIG_ARM=y
+++S:CONFIG_TARGET_MX6_CUBOX_I=y
+diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c
+index 549d648..c49d69f 100644
+--- a/drivers/net/fec_mxc.c
++++ b/drivers/net/fec_mxc.c
+@@ -125,8 +125,10 @@ static int fec_mdio_read(struct ethernet_regs *eth, uint8_t phyAddr,
* it's now safe to read the PHY's register
*/
val = (unsigned short)readl(ð->mii_data);
@@ -2242,7 +2482,7 @@
return val;
}
-@@ -173,8 +175,10 @@ static int fec_mdio_write(struct etherne
+@@ -173,8 +175,10 @@ static int fec_mdio_write(struct ethernet_regs *eth, uint8_t phyAddr,
* clear MII interrupt bit
*/
writel(FEC_IEVENT_MII, ð->ievent);
@@ -2253,7 +2493,7 @@
return 0;
}
-@@ -750,9 +754,11 @@ static int fec_send(struct eth_device *d
+@@ -750,9 +754,11 @@ static int fec_send(struct eth_device *dev, void *packet, int length)
ret = -EINVAL;
out:
@@ -2265,7 +2505,7 @@
/* for next transmission use the other buffer */
if (fec->tbd_index)
fec->tbd_index = 0;
-@@ -784,7 +790,9 @@ static int fec_recv(struct eth_device *d
+@@ -784,7 +790,9 @@ static int fec_recv(struct eth_device *dev)
*/
ievent = readl(&fec->eth->ievent);
writel(ievent, &fec->eth->ievent);
@@ -2275,7 +2515,7 @@
if (ievent & FEC_IEVENT_BABR) {
fec_halt(dev);
fec_init(dev, fec->bd);
-@@ -825,7 +833,9 @@ static int fec_recv(struct eth_device *d
+@@ -825,7 +833,9 @@ static int fec_recv(struct eth_device *dev)
invalidate_dcache_range(addr, addr + size);
bd_status = readw(&rbd->status);
@@ -2285,7 +2525,7 @@
if (!(bd_status & FEC_RBD_EMPTY)) {
if ((bd_status & FEC_RBD_LAST) && !(bd_status & FEC_RBD_ERR) &&
-@@ -880,7 +890,9 @@ static int fec_recv(struct eth_device *d
+@@ -880,7 +890,9 @@ static int fec_recv(struct eth_device *dev)
fec_rx_task_enable(fec);
fec->rbd_index = (fec->rbd_index + 1) % FEC_RBD_NUM;
}
@@ -2295,10 +2535,11 @@
return len;
}
-Index: u-boot/include/configs/mx6_c1.h
-===================================================================
+diff --git a/include/configs/mx6_c1.h b/include/configs/mx6_c1.h
+new file mode 100644
+index 0000000..3a3635f
--- /dev/null
-+++ u-boot/include/configs/mx6_c1.h
++++ b/include/configs/mx6_c1.h
@@ -0,0 +1,349 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
@@ -2649,10 +2890,10 @@
+#endif
+
+#endif /* __CONFIG_H * */
-Index: u-boot/include/configs/mx6_common.h
-===================================================================
---- u-boot.orig/include/configs/mx6_common.h
-+++ u-boot/include/configs/mx6_common.h
+diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h
+index 135a3f5..e3ee5ce 100644
+--- a/include/configs/mx6_common.h
++++ b/include/configs/mx6_common.h
@@ -30,4 +30,6 @@
#define CONFIG_MP
@@ -2660,11 +2901,12 @@
+#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
+
#endif
-Index: u-boot/include/configs/mx6_cubox-i.h
-===================================================================
+diff --git a/include/configs/mx6_cubox-i.h b/include/configs/mx6_cubox-i.h
+new file mode 100644
+index 0000000..aefba7a
--- /dev/null
-+++ u-boot/include/configs/mx6_cubox-i.h
-@@ -0,0 +1,369 @@
++++ b/include/configs/mx6_cubox-i.h
+@@ -0,0 +1,370 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2013 SolidRun ltd.
@@ -2814,6 +3056,7 @@
+#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW)
+#define CONFIG_MXC_USB_FLAGS 0
+#define CONFIG_USB_KEYBOARD
++#define CONFIG_SYS_STDIO_DEREGISTER
+#define CONFIG_SYS_USB_EVENT_POLL
+#define CONFIG_PREBOOT "usb start"
+#endif
@@ -2949,13 +3192,13 @@
+ "mmc dev ${mmcdev}; if mmc rescan; then " \
+ "for prefix in ${boot_prefixes}; do " \
+ "setenv file_prefix ${prefix}; " \
++ "run autodetectfdt; " \
++ "if run loadbootenv; then " \
++ "run importbootenv; " \
++ "fi; " \
+ "if run loadbootscript; then " \
+ "run bootscript; " \
+ "else " \
-+ "run autodetectfdt; " \
-+ "if run loadbootenv; then " \
-+ "run importbootenv; " \
-+ "fi; " \
+ "if test ${bootfile} = auto; then " \
+ "setenv origbootfile auto; " \
+ "setenv bootfile zImage; " \
@@ -3034,10 +3277,10 @@
+#endif
+
+#endif /* __CONFIG_H * */
-Index: u-boot/lib/hashtable.c
-===================================================================
---- u-boot.orig/lib/hashtable.c
-+++ u-boot/lib/hashtable.c
+diff --git a/lib/hashtable.c b/lib/hashtable.c
+index 18ed590..8de0d58 100644
+--- a/lib/hashtable.c
++++ b/lib/hashtable.c
@@ -922,7 +922,7 @@ int himport_r(struct hsearch_data *htab,
printf("himport_r: can't insert \"%s=%s\" into hash table\n",
name, value);
@@ -3047,3 +3290,7 @@
htab, htab->filled, htab->size,
rv, name, value);
} while ((dp < data + size) && *dp); /* size check needed for text */
+diff --git a/tools/logos/solidrun.bmp b/tools/logos/solidrun.bmp
+new file mode 100644
+index 0000000..93db1f8
+Binary files /dev/null and b/tools/logos/solidrun.bmp differ
diff -Nru u-boot-2014.10+dfsg1/debian/patches/cubox-i/emulate-config_distro_bootcmd-standardization.diff u-boot-2014.10+dfsg1/debian/patches/cubox-i/emulate-config_distro_bootcmd-standardization.diff
--- u-boot-2014.10+dfsg1/debian/patches/cubox-i/emulate-config_distro_bootcmd-standardization.diff 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/patches/cubox-i/emulate-config_distro_bootcmd-standardization.diff 2014-11-01 15:17:22.000000000 -0700
@@ -0,0 +1,19 @@
+Set additional variables (boot_targets, devtype, devnum, bootpart) to
+emulate config_distro_bootcmd.h so that the debian-installer
+bootscript will work.
+
+Index: u-boot/include/configs/mx6_cubox-i.h
+===================================================================
+--- u-boot.orig/include/configs/mx6_cubox-i.h
++++ u-boot/include/configs/mx6_cubox-i.h
+@@ -286,6 +286,10 @@
+
+ #define CONFIG_BOOTCOMMAND \
+ "mmc dev ${mmcdev}; if mmc rescan; then " \
++ "setenv boot_targets mmc ; " \
++ "setenv devtype mmc ; " \
++ "setenv devnum ${mmcdev} ; " \
++ "setenv bootpart ${mmcpart} ; " \
+ "for prefix in ${boot_prefixes}; do " \
+ "setenv file_prefix ${prefix}; " \
+ "run autodetectfdt; " \
diff -Nru u-boot-2014.10+dfsg1/debian/patches/cubox-i/imx6-spl-support.diff u-boot-2014.10+dfsg1/debian/patches/cubox-i/imx6-spl-support.diff
--- u-boot-2014.10+dfsg1/debian/patches/cubox-i/imx6-spl-support.diff 2014-10-15 10:41:53.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/patches/cubox-i/imx6-spl-support.diff 2014-11-01 15:17:22.000000000 -0700
@@ -2,10 +2,11 @@
Description: add i.MX6 SPL support
Taken from https://github.com/rabeeh/u-boot-imx6.git
-Index: u-boot/arch/arm/cpu/armv7/mx6/u-boot-spl.lds
-===================================================================
+diff --git a/arch/arm/cpu/armv7/mx6/u-boot-spl.lds b/arch/arm/cpu/armv7/mx6/u-boot-spl.lds
+new file mode 100644
+index 0000000..5e93b34
--- /dev/null
-+++ u-boot/arch/arm/cpu/armv7/mx6/u-boot-spl.lds
++++ b/arch/arm/cpu/armv7/mx6/u-boot-spl.lds
@@ -0,0 +1,47 @@
+/*
+ * (C) Copyright 2002
@@ -54,10 +55,10 @@
+ __bss_end = .;
+ } >.sdram
+}
-Index: u-boot/arch/arm/imx-common/spl.c
-===================================================================
---- u-boot.orig/arch/arm/imx-common/spl.c
-+++ u-boot/arch/arm/imx-common/spl.c
+diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c
+index 9a02a64..30ca9fa 100644
+--- a/arch/arm/imx-common/spl.c
++++ b/arch/arm/imx-common/spl.c
@@ -46,7 +46,10 @@ u32 spl_boot_device(void)
/* SD/eSD: 8.5.3, Table 8-15 */
case 0x4:
@@ -86,10 +87,10 @@
break;
default:
puts("spl: ERROR: unsupported device\n");
-Index: u-boot/common/spl/spl_mmc.c
-===================================================================
---- u-boot.orig/common/spl/spl_mmc.c
-+++ u-boot/common/spl/spl_mmc.c
+diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
+index fa6f891..847d840 100644
+--- a/common/spl/spl_mmc.c
++++ b/common/spl/spl_mmc.c
@@ -93,26 +93,26 @@ void spl_mmc_load_image(void)
}
@@ -169,11 +170,11 @@
if (err)
hang();
-Index: u-boot/drivers/mtd/nand/mxs_nand.c
-===================================================================
---- u-boot.orig/drivers/mtd/nand/mxs_nand.c
-+++ u-boot/drivers/mtd/nand/mxs_nand.c
-@@ -1014,9 +1014,12 @@ static int mxs_nand_scan_bbt(struct mtd_
+diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c
+index 036c113..36cfc18 100644
+--- a/drivers/mtd/nand/mxs_nand.c
++++ b/drivers/mtd/nand/mxs_nand.c
+@@ -1014,9 +1014,12 @@ static int mxs_nand_scan_bbt(struct mtd_info *mtd)
nand_info->hooked_block_markbad = mtd->_block_markbad;
mtd->_block_markbad = mxs_nand_hook_block_markbad;
}
@@ -187,11 +188,11 @@
}
/*
-Index: u-boot/drivers/mtd/nand/mxs_nand_spl.c
-===================================================================
---- u-boot.orig/drivers/mtd/nand/mxs_nand_spl.c
-+++ u-boot/drivers/mtd/nand/mxs_nand_spl.c
-@@ -223,9 +223,30 @@ int nand_default_bbt(struct mtd_info *mt
+diff --git a/drivers/mtd/nand/mxs_nand_spl.c b/drivers/mtd/nand/mxs_nand_spl.c
+index 0e7c364..8bc7147 100644
+--- a/drivers/mtd/nand/mxs_nand_spl.c
++++ b/drivers/mtd/nand/mxs_nand_spl.c
+@@ -223,9 +223,30 @@ int nand_default_bbt(struct mtd_info *mtd)
void nand_init(void)
{
@@ -223,23 +224,23 @@
+ nand_chip.select_chip(&mtd, -1);
}
-
-Index: u-boot/include/configs/imx6_spl.h
-===================================================================
---- u-boot.orig/include/configs/imx6_spl.h
-+++ u-boot/include/configs/imx6_spl.h
+diff --git a/include/configs/imx6_spl.h b/include/configs/imx6_spl.h
+index 970460d..d824705 100644
+--- a/include/configs/imx6_spl.h
++++ b/include/configs/imx6_spl.h
@@ -25,7 +25,7 @@
* or 64KB
*/
#define CONFIG_SYS_THUMB_BUILD
-#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/omap-common/u-boot-spl.lds"
-+#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/mx6/u-boot-spl.lds"
++#define CONFIG_SPL_LDSCRIPT "arch/arm/cpu/armv7/mx6/u-boot-spl.lds"
#define CONFIG_SPL_TEXT_BASE 0x00908000
#define CONFIG_SPL_MAX_SIZE (64 * 1024)
#define CONFIG_SPL_START_S_PATH "arch/arm/cpu/armv7"
-Index: u-boot/include/spl.h
-===================================================================
---- u-boot.orig/include/spl.h
-+++ u-boot/include/spl.h
+diff --git a/include/spl.h b/include/spl.h
+index a7e41da..dd80a81 100644
+--- a/include/spl.h
++++ b/include/spl.h
@@ -17,6 +17,7 @@
#define MMCSD_MODE_RAW 1
#define MMCSD_MODE_FAT 2
diff -Nru u-boot-2014.10+dfsg1/debian/patches/cubox-i/spl-sata-support.diff u-boot-2014.10+dfsg1/debian/patches/cubox-i/spl-sata-support.diff
--- u-boot-2014.10+dfsg1/debian/patches/cubox-i/spl-sata-support.diff 2014-10-15 10:41:53.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/patches/cubox-i/spl-sata-support.diff 2014-11-01 15:17:22.000000000 -0700
@@ -3,7 +3,7 @@
Taken from https://github.com/rabeeh/u-boot-imx6.git
diff --git a/common/Makefile b/common/Makefile
-index de5cce8..2060498 100644
+index b19d379..7bdd8b3 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -60,6 +60,8 @@ obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
@@ -16,7 +16,7 @@
obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o
obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o
diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
-index e6c3395..d36e4b9 100644
+index 855808c..5f56acb 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -49,6 +49,8 @@ DECLARE_GLOBAL_DATA_PTR;
diff -Nru u-boot-2014.10+dfsg1/debian/patches/cubox-i/steal-board-eth-init-from-hummingboard.diff u-boot-2014.10+dfsg1/debian/patches/cubox-i/steal-board-eth-init-from-hummingboard.diff
--- u-boot-2014.10+dfsg1/debian/patches/cubox-i/steal-board-eth-init-from-hummingboard.diff 2014-10-15 10:41:53.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/patches/cubox-i/steal-board-eth-init-from-hummingboard.diff 2014-11-01 15:17:22.000000000 -0700
@@ -10,8 +10,8 @@
int board_eth_init(bd_t *bis)
{
- int ret;
-- struct iomuxc_base_regs *const iomuxc_regs
-- = (struct iomuxc_base_regs *) IOMUXC_BASE_ADDR;
+- struct iomuxc *const iomuxc_regs
+- = (struct iomuxc *) IOMUXC_BASE_ADDR;
- struct anatop_regs __iomem *anatop =
- (struct anatop_regs __iomem *)ANATOP_BASE_ADDR;
- u32 reg = 0;
diff -Nru u-boot-2014.10+dfsg1/debian/patches/cubox-i/Switch-mx6_cubox-i-to-Kconfig.patch u-boot-2014.10+dfsg1/debian/patches/cubox-i/Switch-mx6_cubox-i-to-Kconfig.patch
--- u-boot-2014.10+dfsg1/debian/patches/cubox-i/Switch-mx6_cubox-i-to-Kconfig.patch 2014-10-15 10:41:53.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/patches/cubox-i/Switch-mx6_cubox-i-to-Kconfig.patch 1969-12-31 16:00:00.000000000 -0800
@@ -1,92 +0,0 @@
-From 82d341f41708f5da5e99d00f3065fe6f3da64087 Mon Sep 17 00:00:00 2001
-From: Vagrant Cascadian <vagrant@debian.org>
-Date: Thu, 2 Oct 2014 16:15:50 -0700
-Subject: [PATCH 2/2] Switch mx6_cubox-i to Kconfig.
-
----
- arch/arm/Kconfig | 4 ++++
- board/solidrun/mx6_cubox-i/Kconfig | 23 +++++++++++++++++++++++
- board/solidrun/mx6_cubox-i/MAINTAINERS | 6 ++++++
- configs/mx6_cubox-i_defconfig | 4 ++++
- 4 files changed, 37 insertions(+)
- create mode 100644 board/solidrun/mx6_cubox-i/Kconfig
- create mode 100644 board/solidrun/mx6_cubox-i/MAINTAINERS
- create mode 100644 configs/mx6_cubox-i_defconfig
-
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index 22f0f09..5cf5ac5 100644
---- a/arch/arm/Kconfig
-+++ b/arch/arm/Kconfig
-@@ -388,6 +388,9 @@ config TARGET_EMBESTMX6BOARDS
- config TARGET_ARISTAINETOS
- bool "Support aristainetos"
-
-+config TARGET_MX6_CUBOX_I
-+ bool "Support mx6_cubox-i"
-+
- config TARGET_MX6QARM2
- bool "Support mx6qarm2"
-
-@@ -648,6 +651,7 @@ source "board/siemens/rut/Kconfig"
- source "board/siemens/taurus/Kconfig"
- source "board/silica/pengwyn/Kconfig"
- source "board/solidrun/hummingboard/Kconfig"
-+source "board/solidrun/mx6_cubox-i/Kconfig"
- source "board/spear/spear300/Kconfig"
- source "board/spear/spear310/Kconfig"
- source "board/spear/spear320/Kconfig"
-diff --git a/board/solidrun/mx6_cubox-i/Kconfig b/board/solidrun/mx6_cubox-i/Kconfig
-new file mode 100644
-index 0000000..c4ec8fb
---- /dev/null
-+++ b/board/solidrun/mx6_cubox-i/Kconfig
-@@ -0,0 +1,23 @@
-+if TARGET_MX6_CUBOX_I
-+
-+config SYS_CPU
-+ string
-+ default "armv7"
-+
-+config SYS_BOARD
-+ string
-+ default "mx6_cubox-i"
-+
-+config SYS_VENDOR
-+ string
-+ default "solidrun"
-+
-+config SYS_SOC
-+ string
-+ default "mx6"
-+
-+config SYS_CONFIG_NAME
-+ string
-+ default "mx6_cubox-i"
-+
-+endif
-diff --git a/board/solidrun/mx6_cubox-i/MAINTAINERS b/board/solidrun/mx6_cubox-i/MAINTAINERS
-new file mode 100644
-index 0000000..ceca986
---- /dev/null
-+++ b/board/solidrun/mx6_cubox-i/MAINTAINERS
-@@ -0,0 +1,6 @@
-+MX6 CuBox-I BOARD
-+M: Vagrant Cascadian <vagrant@debian.org>
-+S: Maintained
-+F: board/solidrun/mx6_cubox-i/
-+F: include/configs/mx6_cubox-i.h
-+F: configs/mx6_cubox-i_defconfig
-diff --git a/configs/mx6_cubox-i_defconfig b/configs/mx6_cubox-i_defconfig
-new file mode 100644
-index 0000000..8e038bf
---- /dev/null
-+++ b/configs/mx6_cubox-i_defconfig
-@@ -0,0 +1,4 @@
-+CONFIG_SPL=y
-+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/solidrun/mx6_cubox-i/imx6image.cfg,MX6QDL,SPL,FSL_ENV_IN_MMC"
-++S:CONFIG_ARM=y
-++S:CONFIG_TARGET_MX6_CUBOX_I=y
-\ No newline at end of file
---
-2.1.0
-
diff -Nru u-boot-2014.10+dfsg1/debian/patches/series u-boot-2014.10+dfsg1/debian/patches/series
--- u-boot-2014.10+dfsg1/debian/patches/series 2014-10-17 08:41:10.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/patches/series 2014-11-01 15:17:22.000000000 -0700
@@ -4,16 +4,22 @@
no-error-on-set-but-unused-variables.diff
hurd.diff
guruplug_mvfs_and_mmc.diff
-0001-wandboard-uEnv.txt-bootz-n-fixes.patch
+
+wandboard/wandboard-uEnv.txt-bootz-n-fixes.patch
+wandboard/wandboard-standardized-variables
+wandboard/emulate-config_distro_bootcmd-standardization.diff
+
ti_armv7_common-support_raw_initrd.diff
am335x-uenv.txt.diff
cubox-i/spl-sata-support.diff
cubox-i/imx6-spl-support.diff
cubox-i/cubox-i-support.diff
cubox-i/cubox-i-raw-initrd.diff
-cubox-i/Switch-mx6_cubox-i-to-Kconfig.patch
cubox-i/steal-board-eth-init-from-hummingboard.diff
cubox-i/generic-board.diff
+cubox-i/cubox-i-standardize-variables.diff
+cubox-i/emulate-config_distro_bootcmd-standardization.diff
+
n900-bootz-raw-initrd.diff
no-force-CROSS_COMPILE-powerpc.diff
am335x-bootscript.diff
@@ -32,3 +38,4 @@
arndale/board-spl-rule.diff
arndale/exynos-Enable-config_distro_defaults.h.patch
arndale/exynos5-Use-config_distro_bootcmd.h.patch
+
diff -Nru u-boot-2014.10+dfsg1/debian/patches/wandboard/emulate-config_distro_bootcmd-standardization.diff u-boot-2014.10+dfsg1/debian/patches/wandboard/emulate-config_distro_bootcmd-standardization.diff
--- u-boot-2014.10+dfsg1/debian/patches/wandboard/emulate-config_distro_bootcmd-standardization.diff 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/patches/wandboard/emulate-config_distro_bootcmd-standardization.diff 2014-11-01 15:17:22.000000000 -0700
@@ -0,0 +1,19 @@
+Set additional variables (boot_targets, devtype, devnum, bootpart) to
+emulate config_distro_bootcmd.h so that the debian-installer
+bootscript will work.
+
+Index: u-boot/include/configs/wandboard.h
+===================================================================
+--- u-boot.orig/include/configs/wandboard.h
++++ u-boot/include/configs/wandboard.h
+@@ -236,6 +236,10 @@
+
+ #define CONFIG_BOOTCOMMAND \
+ "mmc dev ${mmcdev};" \
++ "setenv boot_targets mmc ; " \
++ "setenv devtype mmc ; " \
++ "setenv devnum ${mmcdev} ; " \
++ "setenv bootpart ${mmcpart} ; " \
+ "if mmc rescan; then " \
+ "echo SD/MMC found on device ${mmcdev};" \
+ "if run loadbootenv; then " \
diff -Nru u-boot-2014.10+dfsg1/debian/patches/wandboard/wandboard-standardized-variables u-boot-2014.10+dfsg1/debian/patches/wandboard/wandboard-standardized-variables
--- u-boot-2014.10+dfsg1/debian/patches/wandboard/wandboard-standardized-variables 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/patches/wandboard/wandboard-standardized-variables 2014-11-01 15:17:22.000000000 -0700
@@ -0,0 +1,20 @@
+Adds standardized variables, fdtfile, fdt_addr_r, ramdisk_addr_r and
+kernel_addr_r.
+
+Index: u-boot/include/configs/wandboard.h
+===================================================================
+--- u-boot.orig/include/configs/wandboard.h
++++ u-boot/include/configs/wandboard.h
+@@ -131,7 +131,12 @@
+ "fdt_high=0xffffffff\0" \
+ "initrd_high=0xffffffff\0" \
+ "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \
++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+ "fdt_addr=0x18000000\0" \
++ "fdt_addr_r=0x18000000\0" \
++ "ramdiskaddr=0x13000000\0" \
++ "ramdisk_addr_r=0x13000000\0" \
++ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+ "boot_fdt=try\0" \
+ "ip_dyn=yes\0" \
+ "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \
diff -Nru u-boot-2014.10+dfsg1/debian/patches/wandboard/wandboard-uEnv.txt-bootz-n-fixes.patch u-boot-2014.10+dfsg1/debian/patches/wandboard/wandboard-uEnv.txt-bootz-n-fixes.patch
--- u-boot-2014.10+dfsg1/debian/patches/wandboard/wandboard-uEnv.txt-bootz-n-fixes.patch 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/patches/wandboard/wandboard-uEnv.txt-bootz-n-fixes.patch 2014-11-01 15:17:22.000000000 -0700
@@ -0,0 +1,103 @@
+Downloaded from:
+
+ https://raw.github.com/eewiki/u-boot-patches/master/v2014.01/0001-wandboard-uEnv.txt-bootz-n-fixes.patch
+
+Modified to reduce diff with upstream:
+- keep the default bootdelay.
+- keep support for bootscripts.
+- consistantly use "load" vs. "fatload".
+
+From d0bf1e44422e4102859d9420a8abf42c3600f500 Mon Sep 17 00:00:00 2001
+From: Robert Nelson <robertcnelson@gmail.com>
+Date: Thu, 23 Jan 2014 16:24:13 -0600
+Subject: [PATCH] wandboard: uEnv.txt, bootz, n fixes
+
+Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
+---
+ include/configs/wandboard.h | 56 +++++++++++++++++++++++++++++++--------------
+ 1 file changed, 39 insertions(+), 17 deletions(-)
+
+Index: u-boot/include/configs/wandboard.h
+===================================================================
+--- u-boot.orig/include/configs/wandboard.h
++++ u-boot/include/configs/wandboard.h
+@@ -76,6 +76,8 @@
+ #define CONFIG_BOUNCE_BUFFER
+ #define CONFIG_CMD_EXT2
+ #define CONFIG_CMD_FAT
++#define CONFIG_CMD_EXT4
++#define CONFIG_CMD_FS_GENERIC
+ #define CONFIG_DOS_PARTITION
+
+ /* Ethernet Configuration */
+@@ -172,12 +174,16 @@
+ "echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \
+ "fi; " \
+ "setenv bootargs ${bootargs} ${fbmem}\0" \
++ "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} uEnv.txt\0" \
++ "importbootenv=echo Importing environment from mmc (uEnv.txt)...; " \
++ "env import -t $loadaddr $filesize\0" \
+ "loadbootscript=" \
+- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
++ "load 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" \
++ "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \
++ "loadzimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} zImage\0" \
++ "loadfdt=load 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 " \
+@@ -219,16 +225,32 @@
+ "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"
++ "mmc dev ${mmcdev};" \
++ "if mmc rescan; then " \
++ "echo SD/MMC found on device ${mmcdev};" \
++ "if run loadbootenv; then " \
++ "run importbootenv;" \
++ "fi;" \
++ "echo Checking if uenvcmd is set ...;" \
++ "if test -n $uenvcmd; then " \
++ "echo Running uenvcmd ...;" \
++ "run uenvcmd;" \
++ "fi;" \
++ "if run loadbootscript; then " \
++ "echo Running boot script ${script} ...;" \
++ "run bootscript; " \
++ "fi;" \
++ "setenv script /boot/${script};" \
++ "if run loadbootscript; then " \
++ "echo Running boot script ${script} ...;" \
++ "run bootscript; " \
++ "fi;" \
++ "echo Running default loadzimage ...;" \
++ "if run loadzimage; then " \
++ "run loadfdt;" \
++ "run mmcboot;" \
++ "fi;" \
++ "fi;"
+
+ /* Miscellaneous configurable options */
+ #define CONFIG_SYS_LONGHELP
+@@ -269,6 +291,7 @@
+
+ #define CONFIG_OF_LIBFDT
+ #define CONFIG_CMD_BOOTZ
++#define CONFIG_SUPPORT_RAW_INITRD
+
+ #ifndef CONFIG_SYS_DCACHE_OFF
+ #define CONFIG_CMD_CACHE
diff -Nru u-boot-2014.10+dfsg1/debian/README.Debian u-boot-2014.10+dfsg1/debian/README.Debian
--- u-boot-2014.10+dfsg1/debian/README.Debian 2014-10-15 10:41:53.000000000 -0700
+++ u-boot-2014.10+dfsg1/debian/README.Debian 1969-12-31 16:00:00.000000000 -0800
@@ -1,29 +0,0 @@
-== Installation ==
-
-At this point, you must install U-Boot to flash yourself.
-
-Some examples using mtd-utils:
-
-SheevaPlug:
-
- sudo flash_erase /dev/mtd0 0 0
- sudo nandwrite -p /dev/mtd0 /usr/lib/u-boot/sheevaplug/u-boot.kwb
-
-GuruPlug:
-
- sudo flash_erase /dev/mtd0 0 0
- sudo nandwrite -p /dev/mtd0 /usr/lib/u-boot/guruplug/u-boot.kwb
-
-MX53LOCO:
-
- sudo dd bs=1024 if=u-boot.imx of=/dev/sdX seek=1
-
-DreamPlug:
-
- At this point you cannot write to the SPI/NOR flash from Linux,
- so you will need to replace U-Boot from within U-Boot.
-
-== U-Boot environment tools ==
-
-fw_printenv / fw_setenv read /etc/fw_env.config for configuration.
-
diff -Nru u-boot-2014.10+dfsg1/debian/u-boot-imx.README.Debian u-boot-2014.10+dfsg1/debian/u-boot-imx.README.Debian
--- u-boot-2014.10+dfsg1/debian/u-boot-imx.README.Debian 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/u-boot-imx.README.Debian 2014-11-01 15:17:22.000000000 -0700
@@ -0,0 +1,20 @@
+== Installation ==
+
+At this point, you must install U-Boot to flash yourself.
+
+MX53LOCO:
+
+ dd bs=1024 if=u-boot.imx of=/dev/sdX seek=1
+
+wandboard_quad:
+
+ dd if=/usr/lib/u-boot/wandboard_quad/u-boot.imx of=/dev/mmcblkX bs=512 seek=2
+
+mx6_cubox-i:
+
+ dd if=/usr/lib/u-boot/mx6_cubox-i/SPL of=/dev/mmcblk0 bs=1k seek=1
+ dd if=/usr/lib/u-boot/mx6_cubox-i/u-boot.img of=/dev/mmcblk0 bs=1k seek=42
+
+== U-Boot environment tools ==
+
+fw_printenv / fw_setenv read /etc/fw_env.config for configuration.
diff -Nru u-boot-2014.10+dfsg1/debian/u-boot-omap.README.Debian u-boot-2014.10+dfsg1/debian/u-boot-omap.README.Debian
--- u-boot-2014.10+dfsg1/debian/u-boot-omap.README.Debian 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/u-boot-omap.README.Debian 2014-11-01 15:17:22.000000000 -0700
@@ -0,0 +1,13 @@
+== Installation ==
+
+At this point, you must install U-Boot to flash yourself.
+
+The BeagleBone Black (am335x_boneblack) can be flashed to microSD or eMMC directly:
+
+ dd if=/usr/lib/u-boot/am335x_boneblack/MLO of=/dev/mmcblkX count=1 seek=1 conv=notrunc bs=128k
+ dd if=/usr/lib/u-boot/am335x_boneblack/u-boot.img of=/dev/mmcblkX count=2 seek=1 conv=notrunc bs=384k
+
+== U-Boot environment tools ==
+
+fw_printenv / fw_setenv read /etc/fw_env.config for configuration.
+
diff -Nru u-boot-2014.10+dfsg1/debian/u-boot.README.Debian u-boot-2014.10+dfsg1/debian/u-boot.README.Debian
--- u-boot-2014.10+dfsg1/debian/u-boot.README.Debian 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/u-boot.README.Debian 2014-11-01 15:17:22.000000000 -0700
@@ -0,0 +1,25 @@
+== Installation ==
+
+At this point, you must install U-Boot to flash yourself.
+
+Some examples using mtd-utils:
+
+SheevaPlug:
+
+ sudo flash_erase /dev/mtd0 0 0
+ sudo nandwrite -p /dev/mtd0 /usr/lib/u-boot/sheevaplug/u-boot.kwb
+
+GuruPlug:
+
+ sudo flash_erase /dev/mtd0 0 0
+ sudo nandwrite -p /dev/mtd0 /usr/lib/u-boot/guruplug/u-boot.kwb
+
+DreamPlug:
+
+ At this point you cannot write to the SPI/NOR flash from Linux,
+ so you will need to replace U-Boot from within U-Boot.
+
+== U-Boot environment tools ==
+
+fw_printenv / fw_setenv read /etc/fw_env.config for configuration.
+
diff -Nru u-boot-2014.10+dfsg1/debian/u-boot-sunxi.README.Debian u-boot-2014.10+dfsg1/debian/u-boot-sunxi.README.Debian
--- u-boot-2014.10+dfsg1/debian/u-boot-sunxi.README.Debian 1969-12-31 16:00:00.000000000 -0800
+++ u-boot-2014.10+dfsg1/debian/u-boot-sunxi.README.Debian 2014-11-01 15:17:22.000000000 -0700
@@ -0,0 +1,11 @@
+== Installation ==
+
+At this point, you must install U-Boot to flash yourself.
+
+Many sunxi boards (Bananapi, Cubieboard) can be written to SD directly:
+
+ dd if=/usr/lib/u-boot/BOARD/u-boot-sunxi-with-spl.bin of=/dev/mmcblkX bs=1024 seek=8
+
+== U-Boot environment tools ==
+
+fw_printenv / fw_setenv read /etc/fw_env.config for configuration.
unblock u-boot/2014.10+dfsg1-2
Thanks for your time and work in Debian!
live well,
vagrant
Attachment:
signature.asc
Description: PGP signature