diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-11-09 18:23:14 +0100 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-11-09 18:27:06 +0100 |
| commit | 2c7e37eb45b596e79d2fd4ed960633d69af7c1ed (patch) | |
| tree | 44ce8bff24b2c4336ed04fb9f2dc267d147d4c59 /unmaintained | |
| parent | aeb04d19e3603585357fa0a148567aabecc90804 (diff) | |
libre: Move uboot-* to unmaintained
During years, work was done to replace uboot-* by uboot4extlinux-*
as the user interface is more intuitive in the later packages.
The last commit updating these packages is the following:
commit bb465742c679d4775c512255e05cf7ba726ba94b
Author: Andreas Grapentin <andreas@grapentin.org>
Date: Wed Mar 20 15:05:57 2019 +0100
libre/uboot-am335x_bone: updated to 2017.07
Note that uboot4extlinux-* probably doesn't support all the computers
that were supported by the uboot-* packages.
So it might be a good idea to only delete the uboot-* packages in
unmaintained when all the computers it supported are supported by at
least one of the uboot4extlinux-* packages and that the installation
instructions are updated accordingly.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'unmaintained')
58 files changed, 6297 insertions, 0 deletions
diff --git a/unmaintained/uboot-am335x_bone/0001-parabola-arm-modifications.patch b/unmaintained/uboot-am335x_bone/0001-parabola-arm-modifications.patch new file mode 100644 index 000000000..4fa35ee32 --- /dev/null +++ b/unmaintained/uboot-am335x_bone/0001-parabola-arm-modifications.patch @@ -0,0 +1,71 @@ +From 02714f8c47a6500209907afcc6faf8823e55c0ca Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich <kevin@archlinuxarm.org> +Date: Mon, 14 Aug 2017 18:37:05 -0600 +Subject: [PATCH] arch linux arm modifications + +--- + configs/am335x_boneblack_defconfig | 1 - + include/configs/am335x_evm.h | 8 +++++--- + 2 files changed, 5 insertions(+), 4 deletions(-) + +diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig +index 3d86c1b34e..b8a72e57df 100644 +--- a/configs/am335x_boneblack_defconfig ++++ b/configs/am335x_boneblack_defconfig +@@ -5,7 +5,6 @@ CONFIG_AM33XX=y + # CONFIG_SPL_NAND_SUPPORT is not set + CONFIG_SPL_STACK_R_ADDR=0x82000000 + CONFIG_DISTRO_DEFAULTS=y +-CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" + CONFIG_SYS_CONSOLE_INFO_QUIET=y + CONFIG_VERSION_VARIABLE=y + CONFIG_ARCH_MISC_INIT=y +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index 0c6d2880da..9afc46411d 100644 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -17,6 +17,7 @@ + #define __CONFIG_AM335X_EVM_H + + #include <configs/ti_am335x_common.h> ++#define CONFIG_ENV_IS_NOWHERE + + #ifndef CONFIG_SPL_BUILD + # define CONFIG_TIMESTAMP +@@ -76,10 +77,7 @@ + + #define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ +- func(LEGACY_MMC, legacy_mmc, 0) \ + func(MMC, mmc, 1) \ +- func(LEGACY_MMC, legacy_mmc, 1) \ +- func(NAND, nand, 0) \ + func(PXE, pxe, na) \ + func(DHCP, dhcp, na) + +@@ -87,6 +85,10 @@ + "if test ${boot_fit} -eq 1; then " \ + "run update_to_fit;" \ + "fi;" \ ++ "gpio clear 54; " \ ++ "gpio clear 55; " \ ++ "gpio clear 56; " \ ++ "gpio set 53; " \ + "run findfdt; " \ + "run init_console; " \ + "run envboot; " \ +@@ -104,8 +106,9 @@ + DEFAULT_FIT_TI_ARGS \ + "bootpart=0:2\0" \ + "bootdir=/boot\0" \ +- "bootfile=zImage\0" \ +- "fdtfile=undefined\0" \ ++ "bootfile=vmlinuz-linux-libre\0" \ ++ "rdfile=initramfs-linux-libre.img\0" \ ++ "fdtfile=/boot/dtbs/linux-libre\0" \ + "console=ttyO0,115200n8\0" \ + "partitions=" \ + "uuid_disk=${uuid_gpt_disk};" \ +-- +2.14.1 + diff --git a/unmaintained/uboot-am335x_bone/PKGBUILD b/unmaintained/uboot-am335x_bone/PKGBUILD new file mode 100644 index 000000000..22d5b2b34 --- /dev/null +++ b/unmaintained/uboot-am335x_bone/PKGBUILD @@ -0,0 +1,51 @@ +# U-Boot: Beaglebone and Beaglebone Black +# Maintainer (archarm): Kevin Mihelich <kevin@archlinuxarm.org> +# Maintainer: Andreas Grapentin <oaken-source@parabola.nu> +# Contributor: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgname=uboot-am335x_bone +pkgver=2017.07 +pkgrel=1 +pkgdesc="U-Boot for Beaglebone and Beaglebone Black" +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +makedepends=('bc' 'git') +conflicts=(uboot4{extlinux,grub}-am335x_bone) +license=('GPL') +install=${pkgname}.install +backup=('boot/boot.txt' 'boot/boot.scr') +source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" + '0001-parabola-arm-modifications.patch' + 'boot.txt' + 'mkscr') +md5sums=('b74741e7a9ad1cf9a5bfa87302b80f2b' + '89c046a7858da6ea55404c3b8314c41d' + 'e35840bf487af832b84b41b931e16aa1' + '021623a04afd29ac3f368977140cfbfd') + +prepare() { + cd u-boot-${pkgver/rc/-rc} + git apply ../0001-parabola-arm-modifications.patch +} + +build() { + cd u-boot-${pkgver/rc/-rc} + + unset CFLAGS CXXFLAGS LDFLAGS + + make distclean + make am335x_boneblack_defconfig + echo 'CONFIG_IDENT_STRING=" Parabola GNU/Linux-libre"' >> .config + make EXTRAVERSION=-${pkgrel} +} + +package() { + cd u-boot-${pkgver/rc/-rc} + mkdir -p "${pkgdir}"/boot + cp MLO u-boot.img "${pkgdir}"/boot + + tools/mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ../boot.txt "${pkgdir}"/boot/boot.scr + cp ../{boot.txt,mkscr} "${pkgdir}"/boot +} diff --git a/unmaintained/uboot-am335x_bone/boot.txt b/unmaintained/uboot-am335x_bone/boot.txt new file mode 100644 index 000000000..76155ac5a --- /dev/null +++ b/unmaintained/uboot-am335x_bone/boot.txt @@ -0,0 +1,21 @@ +# After modifying, run ./mkscr + +if test -n ${distro_bootpart}; then setenv bootpart ${distro_bootpart}; else setenv bootpart 1; fi +part uuid ${devtype} ${devnum}:${bootpart} uuid + +setenv bootargs "console=tty0 console=${console} root=PARTUUID=${uuid} rw rootwait" + +if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/vmlinuz-linux-libre; then + gpio set 54 + echo fdt: ${fdtfile} + if load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/linux-libre/${fdtfile}; then + gpio set 55 + if load ${devtype} ${devnum}:${bootpart} ${ramdisk_addr_r} /boot/initramfs-linux-libre.img; then + gpio set 56 + bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}; + else + gpio set 56 + bootz ${kernel_addr_r} - ${fdt_addr_r}; + fi; + fi; +fi diff --git a/unmaintained/uboot-am335x_bone/mkscr b/unmaintained/uboot-am335x_bone/mkscr new file mode 100755 index 000000000..272b6a7a5 --- /dev/null +++ b/unmaintained/uboot-am335x_bone/mkscr @@ -0,0 +1,9 @@ +#!/bin/bash + +if [[ ! -x /usr/bin/mkimage ]]; then + echo "mkimage not found. Please install uboot-tools:" + echo " pacman -S uboot-tools" + exit 1 +fi + +mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d boot.txt boot.scr diff --git a/unmaintained/uboot-am335x_bone/uboot-am335x_bone.install b/unmaintained/uboot-am335x_bone/uboot-am335x_bone.install new file mode 100644 index 000000000..3a1a9daed --- /dev/null +++ b/unmaintained/uboot-am335x_bone/uboot-am335x_bone.install @@ -0,0 +1,36 @@ +flash_instructions() { + echo "# dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k" + echo "# dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k" +} + +flash_uboot() { + root=$(mount | awk '/ on \/ / { print $1; }') + if [[ $root =~ ^/dev/mmcblk.*$ ]]; then + root=${root:0:12} + echo "A new U-Boot version needs to be flashed onto $root." + echo "Do this now? [y|N]" + read -r shouldwe + if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then + dd if=/boot/MLO of=$root count=1 seek=1 conv=notrunc bs=128k + dd if=/boot/u-boot.img of=$root count=2 seek=1 conv=notrunc bs=384k + else + echo "You can do this later by running:" + flash_instructions + fi + else + echo "Flash the new U-Boot version onto your boot device. For example:" + flash_instructions + fi +} + +post_install() { + flash_uboot +} + +post_upgrade() { + flash_uboot + if (( $(vercmp $2 2017.07-1) < 0 )); then + echo ' >>> Note: uEnv.txt is no longer sourced. Make any customizations within /boot/boot.txt' + echo ' and run ./mkscr within /boot to convert it to the boot.scr file.' + fi +} diff --git a/unmaintained/uboot-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch b/unmaintained/uboot-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch new file mode 100644 index 000000000..bdb6699e6 --- /dev/null +++ b/unmaintained/uboot-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch @@ -0,0 +1,93 @@ +From 0a3f119b5221e16feb1cbe4036cc16d1dc4c194c Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Sat, 7 Feb 2015 22:52:40 +0100 +Subject: [PATCH 1/6] Add linux/compiler-gcc5.h to fix builds with gcc5 + +Add linux/compiler-gcc5/h from the kernel sources at: + +commit 5631b8fba640a4ab2f8a954f63a603fa34eda96b +Author: Steven Noonan <steven@uplinklabs.net> +Date: Sat Oct 25 15:09:42 2014 -0700 + + compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles + +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- + include/linux/compiler-gcc5.h | 65 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 65 insertions(+) + create mode 100644 include/linux/compiler-gcc5.h + +diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h +new file mode 100644 +index 0000000..c8c5659 +--- /dev/null ++++ b/include/linux/compiler-gcc5.h +@@ -0,0 +1,65 @@ ++#ifndef __LINUX_COMPILER_H ++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." ++#endif ++ ++#define __used __attribute__((__used__)) ++#define __must_check __attribute__((warn_unused_result)) ++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) ++ ++/* Mark functions as cold. gcc will assume any path leading to a call ++ to them will be unlikely. This means a lot of manual unlikely()s ++ are unnecessary now for any paths leading to the usual suspects ++ like BUG(), printk(), panic() etc. [but let's keep them for now for ++ older compilers] ++ ++ Early snapshots of gcc 4.3 don't support this and we can't detect this ++ in the preprocessor, but we can live with this because they're unreleased. ++ Maketime probing would be overkill here. ++ ++ gcc also has a __attribute__((__hot__)) to move hot functions into ++ a special section, but I don't see any sense in this right now in ++ the kernel context */ ++#define __cold __attribute__((__cold__)) ++ ++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) ++ ++#ifndef __CHECKER__ ++# define __compiletime_warning(message) __attribute__((warning(message))) ++# define __compiletime_error(message) __attribute__((error(message))) ++#endif /* __CHECKER__ */ ++ ++/* ++ * Mark a position in code as unreachable. This can be used to ++ * suppress control flow warnings after asm blocks that transfer ++ * control elsewhere. ++ * ++ * Early snapshots of gcc 4.5 don't support this and we can't detect ++ * this in the preprocessor, but we can live with this because they're ++ * unreleased. Really, we need to have autoconf for the kernel. ++ */ ++#define unreachable() __builtin_unreachable() ++ ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) ++ ++/* ++ * Tell the optimizer that something else uses this function or variable. ++ */ ++#define __visible __attribute__((externally_visible)) ++ ++/* ++ * GCC 'asm goto' miscompiles certain code sequences: ++ * ++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 ++ * ++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. ++ * ++ * (asm goto is automatically volatile - the naming reflects this.) ++ */ ++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) ++ ++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP ++#define __HAVE_BUILTIN_BSWAP32__ ++#define __HAVE_BUILTIN_BSWAP64__ ++#define __HAVE_BUILTIN_BSWAP16__ ++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ +-- +2.5.0 + diff --git a/unmaintained/uboot-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch b/unmaintained/uboot-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch new file mode 100644 index 000000000..6ec3d82fc --- /dev/null +++ b/unmaintained/uboot-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch @@ -0,0 +1,76 @@ +From a29b67a36a2b59acfc9cb7adc6e3bc06c490d4ee Mon Sep 17 00:00:00 2001 +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Sun, 22 Jun 2014 23:10:39 +0200 +Subject: [PATCH 2/6] ARM:asm:io.h use static inline + +When compiling u-boot with W=1 the extern inline void for +read* is likely causing the most noise. gcc / clang will +warn there is never a actual declaration for these functions. +Instead of declaring these extern make them static inline so +it is actually declared. + +cc: Albert ARIBAUD <albert.u.boot@aribaud.net> +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +--- + arch/arm/include/asm/io.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h +index 214f3ea..dc6138a 100644 +--- a/arch/arm/include/asm/io.h ++++ b/arch/arm/include/asm/io.h +@@ -77,7 +77,7 @@ static inline phys_addr_t virt_to_phys(void * vaddr) + #define __arch_putl(v,a) (*(volatile unsigned int *)(a) = (v)) + #define __arch_putq(v,a) (*(volatile unsigned long long *)(a) = (v)) + +-extern inline void __raw_writesb(unsigned long addr, const void *data, ++static inline void __raw_writesb(unsigned long addr, const void *data, + int bytelen) + { + uint8_t *buf = (uint8_t *)data; +@@ -85,7 +85,7 @@ extern inline void __raw_writesb(unsigned long addr, const void *data, + __arch_putb(*buf++, addr); + } + +-extern inline void __raw_writesw(unsigned long addr, const void *data, ++static inline void __raw_writesw(unsigned long addr, const void *data, + int wordlen) + { + uint16_t *buf = (uint16_t *)data; +@@ -93,7 +93,7 @@ extern inline void __raw_writesw(unsigned long addr, const void *data, + __arch_putw(*buf++, addr); + } + +-extern inline void __raw_writesl(unsigned long addr, const void *data, ++static inline void __raw_writesl(unsigned long addr, const void *data, + int longlen) + { + uint32_t *buf = (uint32_t *)data; +@@ -101,21 +101,21 @@ extern inline void __raw_writesl(unsigned long addr, const void *data, + __arch_putl(*buf++, addr); + } + +-extern inline void __raw_readsb(unsigned long addr, void *data, int bytelen) ++static inline void __raw_readsb(unsigned long addr, void *data, int bytelen) + { + uint8_t *buf = (uint8_t *)data; + while(bytelen--) + *buf++ = __arch_getb(addr); + } + +-extern inline void __raw_readsw(unsigned long addr, void *data, int wordlen) ++static inline void __raw_readsw(unsigned long addr, void *data, int wordlen) + { + uint16_t *buf = (uint16_t *)data; + while(wordlen--) + *buf++ = __arch_getw(addr); + } + +-extern inline void __raw_readsl(unsigned long addr, void *data, int longlen) ++static inline void __raw_readsl(unsigned long addr, void *data, int longlen) + { + uint32_t *buf = (uint32_t *)data; + while(longlen--) +-- +2.5.0 + diff --git a/unmaintained/uboot-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch b/unmaintained/uboot-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch new file mode 100644 index 000000000..baf1efd5d --- /dev/null +++ b/unmaintained/uboot-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch @@ -0,0 +1,31 @@ +From dc7efb77bbd59224855713a554bb3721568a85c6 Mon Sep 17 00:00:00 2001 +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Thu, 26 Jun 2014 20:18:31 +0200 +Subject: [PATCH 3/6] common: main.c: make show_boot_progress __weak + +This not only looks a bit better it also prevents a +warning with W=1 (no previous prototype). + +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +Acked-by: Simon Glass <sjg@chromium.org> +--- + common/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/common/main.c b/common/main.c +index 32618f1..2979fbe 100644 +--- a/common/main.c ++++ b/common/main.c +@@ -17,8 +17,7 @@ DECLARE_GLOBAL_DATA_PTR; + /* + * Board-specific Platform code can reimplement show_boot_progress () if needed + */ +-void inline __show_boot_progress (int val) {} +-void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); ++__weak void show_boot_progress(int val) {} + + static void modem_init(void) + { +-- +2.5.0 + diff --git a/unmaintained/uboot-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch b/unmaintained/uboot-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch new file mode 100644 index 000000000..f2237a229 --- /dev/null +++ b/unmaintained/uboot-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch @@ -0,0 +1,109 @@ +From ea9b2d003712ae2c6158abb5c9f285f593e8fcb0 Mon Sep 17 00:00:00 2001 +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Mon, 23 Jun 2014 23:20:19 +0200 +Subject: [PATCH 4/6] common: board_f: cosmetic use __weak for leds + +First of all this looks a lot better, but it also +prevents a gcc warning (W=1), that the weak function +has no previous prototype. + +cc: Simon Glass <sjg@chromium.org> +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +Acked-by: Simon Glass <sjg@chromium.org> +--- + common/board_f.c | 29 ++++++++++------------------- + include/status_led.h | 22 +++++++++++----------- + 2 files changed, 21 insertions(+), 30 deletions(-) + +diff --git a/common/board_f.c b/common/board_f.c +index 4ea4cb2..bdab38e 100644 +--- a/common/board_f.c ++++ b/common/board_f.c +@@ -37,6 +37,7 @@ + #include <os.h> + #include <post.h> + #include <spi.h> ++#include <status_led.h> + #include <trace.h> + #include <watchdog.h> + #include <asm/errno.h> +@@ -78,25 +79,15 @@ DECLARE_GLOBAL_DATA_PTR; + ************************************************************************ + * May be supplied by boards if desired + */ +-inline void __coloured_LED_init(void) {} +-void coloured_LED_init(void) +- __attribute__((weak, alias("__coloured_LED_init"))); +-inline void __red_led_on(void) {} +-void red_led_on(void) __attribute__((weak, alias("__red_led_on"))); +-inline void __red_led_off(void) {} +-void red_led_off(void) __attribute__((weak, alias("__red_led_off"))); +-inline void __green_led_on(void) {} +-void green_led_on(void) __attribute__((weak, alias("__green_led_on"))); +-inline void __green_led_off(void) {} +-void green_led_off(void) __attribute__((weak, alias("__green_led_off"))); +-inline void __yellow_led_on(void) {} +-void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on"))); +-inline void __yellow_led_off(void) {} +-void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off"))); +-inline void __blue_led_on(void) {} +-void blue_led_on(void) __attribute__((weak, alias("__blue_led_on"))); +-inline void __blue_led_off(void) {} +-void blue_led_off(void) __attribute__((weak, alias("__blue_led_off"))); ++__weak void coloured_LED_init(void) {} ++__weak void red_led_on(void) {} ++__weak void red_led_off(void) {} ++__weak void green_led_on(void) {} ++__weak void green_led_off(void) {} ++__weak void yellow_led_on(void) {} ++__weak void yellow_led_off(void) {} ++__weak void blue_led_on(void) {} ++__weak void blue_led_off(void) {} + + /* + * Why is gd allocated a register? Prior to reloc it might be better to +diff --git a/include/status_led.h b/include/status_led.h +index 0eb91b8..b8aaaf7 100644 +--- a/include/status_led.h ++++ b/include/status_led.h +@@ -272,19 +272,21 @@ extern void __led_set (led_id_t mask, int state); + # include <asm/status_led.h> + #endif + ++#endif /* CONFIG_STATUS_LED */ ++ + /* + * Coloured LEDs API + */ + #ifndef __ASSEMBLY__ +-extern void coloured_LED_init (void); +-extern void red_led_on(void); +-extern void red_led_off(void); +-extern void green_led_on(void); +-extern void green_led_off(void); +-extern void yellow_led_on(void); +-extern void yellow_led_off(void); +-extern void blue_led_on(void); +-extern void blue_led_off(void); ++void coloured_LED_init(void); ++void red_led_on(void); ++void red_led_off(void); ++void green_led_on(void); ++void green_led_off(void); ++void yellow_led_on(void); ++void yellow_led_off(void); ++void blue_led_on(void); ++void blue_led_off(void); + #else + .extern LED_init + .extern red_led_on +@@ -297,6 +299,4 @@ extern void blue_led_off(void); + .extern blue_led_off + #endif + +-#endif /* CONFIG_STATUS_LED */ +- + #endif /* _STATUS_LED_H_ */ +-- +2.5.0 + diff --git a/unmaintained/uboot-chiliboard/0005-chiliboard-support.patch b/unmaintained/uboot-chiliboard/0005-chiliboard-support.patch new file mode 100644 index 000000000..cbe029a69 --- /dev/null +++ b/unmaintained/uboot-chiliboard/0005-chiliboard-support.patch @@ -0,0 +1,1685 @@ +From 22efc5d711cf5a91a236b3a54f94cbcad0fc7b5e Mon Sep 17 00:00:00 2001 +From: Kevin Mihelich <kevin@archlinuxarm.org> +Date: Sat, 29 Aug 2015 08:56:32 -0600 +Subject: [PATCH 5/6] chiliboard support + +--- + board/grinn/chiliboard/Makefile | 13 + + board/grinn/chiliboard/board.c | 447 +++++++++++++++++++ + board/grinn/chiliboard/board.h | 20 + + board/grinn/chiliboard/mux.c | 99 +++++ + board/grinn/chiliboard/u-boot.lds | 131 ++++++ + boards.cfg | 5 + + drivers/mtd/nand/omap_gpmc.c | 6 +- + include/configs/chiliboard.h | 878 ++++++++++++++++++++++++++++++++++++++ + 8 files changed, 1597 insertions(+), 2 deletions(-) + create mode 100644 board/grinn/chiliboard/Makefile + create mode 100644 board/grinn/chiliboard/board.c + create mode 100644 board/grinn/chiliboard/board.h + create mode 100644 board/grinn/chiliboard/mux.c + create mode 100644 board/grinn/chiliboard/u-boot.lds + create mode 100644 include/configs/chiliboard.h + +diff --git a/board/grinn/chiliboard/Makefile b/board/grinn/chiliboard/Makefile +new file mode 100644 +index 0000000..804ac37 +--- /dev/null ++++ b/board/grinn/chiliboard/Makefile +@@ -0,0 +1,13 @@ ++# ++# Makefile ++# ++# Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/ ++# ++# SPDX-License-Identifier: GPL-2.0+ ++# ++ ++ifeq ($(CONFIG_SKIP_LOWLEVEL_INIT),) ++obj-y := mux.o ++endif ++ ++obj-y += board.o +diff --git a/board/grinn/chiliboard/board.c b/board/grinn/chiliboard/board.c +new file mode 100644 +index 0000000..ed8ab63 +--- /dev/null ++++ b/board/grinn/chiliboard/board.c +@@ -0,0 +1,447 @@ ++/* ++ * board.c ++ * ++ * Board functions for Grinn chiliboard, AM335X based boards ++ * ++ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ ++ * ++ * Copyright (C) 2015, Grinn - http://www.grinn-global.com ++ * Grzegorz Glomb, g.glomb@grinn-global.com ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#include <common.h> ++#include <errno.h> ++#include <spl.h> ++#include <asm/arch/cpu.h> ++#include <asm/arch/hardware.h> ++#include <asm/arch/omap.h> ++#include <asm/arch/ddr_defs.h> ++#include <asm/arch/clock.h> ++#include <asm/arch/gpio.h> ++#include <asm/arch/mmc_host_def.h> ++#include <asm/arch/sys_proto.h> ++#include <asm/arch/mem.h> ++#include <asm/io.h> ++#include <asm/emif.h> ++#include <asm/gpio.h> ++#include <i2c.h> ++#include <miiphy.h> ++#include <cpsw.h> ++#include <power/tps65217.h> ++#include <power/tps65910.h> ++#include <environment.h> ++#include <watchdog.h> ++#include <environment.h> ++#include "board.h" ++ ++DECLARE_GLOBAL_DATA_PTR; ++#define HDR_NAME_LEN 8 ++ ++static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE; ++ ++#ifndef CONFIG_SKIP_LOWLEVEL_INIT ++static const struct ddr_data ddr2_chilisom_gcs1_data = { ++ .datardsratio0 = ((MT47H128M16RT25E_RD_DQS<<30) | ++ (MT47H128M16RT25E_RD_DQS<<20) | ++ (MT47H128M16RT25E_RD_DQS<<10) | ++ (MT47H128M16RT25E_RD_DQS<<0)), ++ .datawdsratio0 = ((MT47H128M16RT25E_WR_DQS<<30) | ++ (MT47H128M16RT25E_WR_DQS<<20) | ++ (MT47H128M16RT25E_WR_DQS<<10) | ++ (MT47H128M16RT25E_WR_DQS<<0)), ++ .datawiratio0 = ((MT47H128M16RT25E_PHY_WRLVL<<30) | ++ (MT47H128M16RT25E_PHY_WRLVL<<20) | ++ (MT47H128M16RT25E_PHY_WRLVL<<10) | ++ (MT47H128M16RT25E_PHY_WRLVL<<0)), ++ .datagiratio0 = ((MT47H128M16RT25E_PHY_GATELVL<<30) | ++ (MT47H128M16RT25E_PHY_GATELVL<<20) | ++ (MT47H128M16RT25E_PHY_GATELVL<<10) | ++ (MT47H128M16RT25E_PHY_GATELVL<<0)), ++ .datafwsratio0 = ((MT47H128M16RT25E_PHY_FIFO_WE<<30) | ++ (MT47H128M16RT25E_PHY_FIFO_WE<<20) | ++ (MT47H128M16RT25E_PHY_FIFO_WE<<10) | ++ (MT47H128M16RT25E_PHY_FIFO_WE<<0)), ++ .datawrsratio0 = ((MT47H128M16RT25E_PHY_WR_DATA<<30) | ++ (MT47H128M16RT25E_PHY_WR_DATA<<20) | ++ (MT47H128M16RT25E_PHY_WR_DATA<<10) | ++ (MT47H128M16RT25E_PHY_WR_DATA<<0)), ++}; ++ ++static const struct cmd_control ddr2_chilisom_gcs1_cmd_ctrl_data = { ++ .cmd0csratio = MT47H128M16RT25E_RATIO, ++ .cmd0iclkout = MT47H128M16RT25E_INVERT_CLKOUT, ++ ++ .cmd1csratio = MT47H128M16RT25E_RATIO, ++ .cmd1iclkout = MT47H128M16RT25E_INVERT_CLKOUT, ++ ++ .cmd2csratio = MT47H128M16RT25E_RATIO, ++ .cmd2iclkout = MT47H128M16RT25E_INVERT_CLKOUT, ++}; ++ ++static const struct emif_regs ddr2_chilisom_gcs1_emif_reg_data = { ++ .sdram_config = MT47H128M16RT25E_EMIF_SDCFG, ++ .ref_ctrl = MT47H128M16RT25E_EMIF_SDREF, ++ .sdram_tim1 = MT47H128M16RT25E_EMIF_TIM1, ++ .sdram_tim2 = MT47H128M16RT25E_EMIF_TIM2, ++ .sdram_tim3 = MT47H128M16RT25E_EMIF_TIM3, ++ .emif_ddr_phy_ctlr_1 = MT47H128M16RT25E_EMIF_READ_LATENCY, ++}; ++ ++static const struct ddr_data ddr3_chilisom_gcs2_data = { ++ .datardsratio0 = MT41K256M16HA125E_RD_DQS, ++ .datawdsratio0 = MT41K256M16HA125E_WR_DQS, ++ .datafwsratio0 = MT41K256M16HA125E_PHY_FIFO_WE, ++ .datawrsratio0 = MT41K256M16HA125E_PHY_WR_DATA, ++}; ++ ++static const struct cmd_control ddr3_chilisom_gcs2_cmd_ctrl_data = { ++ .cmd0csratio = MT41K256M16HA125E_RATIO, ++ .cmd0iclkout = MT41K256M16HA125E_INVERT_CLKOUT, ++ ++ .cmd1csratio = MT41K256M16HA125E_RATIO, ++ .cmd1iclkout = MT41K256M16HA125E_INVERT_CLKOUT, ++ ++ .cmd2csratio = MT41K256M16HA125E_RATIO, ++ .cmd2iclkout = MT41K256M16HA125E_INVERT_CLKOUT, ++}; ++ ++static struct emif_regs ddr3_chilisom_gcs2_emif_reg_data = { ++ .sdram_config = MT41K256M16HA125E_EMIF_SDCFG, ++ .ref_ctrl = MT41K256M16HA125E_EMIF_SDREF, ++ .sdram_tim1 = MT41K256M16HA125E_EMIF_TIM1, ++ .sdram_tim2 = MT41K256M16HA125E_EMIF_TIM2, ++ .sdram_tim3 = MT41K256M16HA125E_EMIF_TIM3, ++ .zq_config = MT41K256M16HA125E_ZQ_CFG, ++ .emif_ddr_phy_ctlr_1 = MT41K256M16HA125E_EMIF_READ_LATENCY, ++}; ++ ++#ifdef CONFIG_SPL_OS_BOOT ++int spl_start_uboot(void) ++{ ++ /* break into full u-boot on 'c' */ ++ if (serial_tstc() && serial_getc() == 'c') ++ return 1; ++ ++#ifdef CONFIG_SPL_ENV_SUPPORT ++ env_init(); ++ env_relocate_spec(); ++ if (getenv_yesno("boot_os") != 1) ++ return 1; ++#endif ++ ++ return 0; ++} ++#endif ++ ++#define OSC (V_OSCK/1000000) ++const struct dpll_params dpll_ddr_chilisom_gcs1 = { ++ 266, OSC-1, 1, -1, -1, -1, -1}; ++const struct dpll_params dpll_ddr_chilisom_gcs2 = { ++ 400, OSC-1, 1, -1, -1, -1, -1}; ++ ++void am33xx_spl_board_init(void) ++{ ++ int mpu_vdd; ++ ++ dpll_mpu_opp100.m = am335x_get_efuse_mpu_max_freq(cdev); ++ ++ int usb_cur_lim; ++ ++ if (i2c_probe(TPS65217_CHIP_PM)) ++ return; ++ ++ uchar pmic_status_reg; ++ if (tps65217_reg_read(TPS65217_STATUS, &pmic_status_reg)) ++ return; ++ if (!(pmic_status_reg & TPS65217_PWR_SRC_AC_BITMASK)) { ++ puts("No AC power, disabling frequency switch\n"); ++ return; ++ } ++ ++ /* ++ * Increase USB current limit to 1300mA or 1800mA and set ++ * the MPU voltage controller as needed. ++ */ ++ if (dpll_mpu_opp100.m == MPUPLL_M_1000) { ++ usb_cur_lim = TPS65217_USB_INPUT_CUR_LIMIT_1800MA; ++ mpu_vdd = TPS65217_DCDC_VOLT_SEL_1325MV; ++ } else { ++ usb_cur_lim = TPS65217_USB_INPUT_CUR_LIMIT_1300MA; ++ mpu_vdd = TPS65217_DCDC_VOLT_SEL_1275MV; ++ } ++ ++ if (tps65217_reg_write(TPS65217_PROT_LEVEL_NONE, ++ TPS65217_POWER_PATH, ++ usb_cur_lim, ++ TPS65217_USB_INPUT_CUR_LIMIT_MASK)) ++ puts("tps65217_reg_write failure\n"); ++ ++ /* Set DCDC3 (CORE) voltage to 1.125V */ ++ if (tps65217_voltage_update(TPS65217_DEFDCDC3, ++ TPS65217_DCDC_VOLT_SEL_1125MV)) { ++ puts("tps65217_voltage_update failure\n"); ++ return; ++ } ++ ++ do_setup_dpll(&dpll_core_regs, &dpll_core_opp100); ++ if (tps65217_voltage_update(TPS65217_DEFDCDC2, mpu_vdd)) { ++ puts("tps65217_voltage_update failure\n"); ++ return; ++ } ++ ++ /* Set LDO3, LDO4 output voltage to 3.3V for GCS1. ++ * Set LDO3 to 1.8V and LDO4 to 3.3V for GCS2. */ ++ ++ #ifdef CONFIG_CHILISOM_GCS2 ++ if (tps65217_reg_write(TPS65217_PROT_LEVEL_2, ++ TPS65217_DEFLS1, ++ TPS65217_LDO_VOLTAGE_OUT_1_8, ++ TPS65217_LDO_MASK)) ++ puts("tps65217_reg_write failure\n"); ++ if (tps65217_reg_write(TPS65217_PROT_LEVEL_2, ++ TPS65217_DEFLS2, ++ TPS65217_LDO_VOLTAGE_OUT_3_3, ++ TPS65217_LDO_MASK)) ++ puts("tps65217_reg_write failure\n"); ++ #else ++ ++ if (tps65217_reg_write(TPS65217_PROT_LEVEL_2, ++ TPS65217_DEFLS1, ++ TPS65217_LDO_VOLTAGE_OUT_3_3, ++ TPS65217_LDO_MASK)) ++ puts("tps65217_reg_write failure\n"); ++ if (tps65217_reg_write(TPS65217_PROT_LEVEL_2, ++ TPS65217_DEFLS2, ++ TPS65217_LDO_VOLTAGE_OUT_3_3, ++ TPS65217_LDO_MASK)) ++ puts("tps65217_reg_write failure\n"); ++ #endif ++ ++ do_setup_dpll(&dpll_mpu_regs, &dpll_mpu_opp100); ++} ++ ++const struct dpll_params *get_dpll_ddr_params(void) ++{ ++ enable_i2c0_pin_mux(); ++ i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); ++ ++#ifndef CONFIG_CHILISOM_GCS2 ++ return &dpll_ddr_chilisom_gcs1; ++#else ++ return &dpll_ddr_chilisom_gcs2; ++#endif ++} ++ ++void set_uart_mux_conf(void) ++{ ++#ifdef CONFIG_SERIAL1 ++ enable_uart0_pin_mux(); ++#endif /* CONFIG_SERIAL1 */ ++} ++ ++void set_mux_conf_regs(void) ++{ ++ enable_board_pin_mux(); ++} ++ ++const struct ctrl_ioregs ioregs_chilisom_gcs1 = { ++ .cm0ioctl = MT47H128M16RT25E_IOCTRL_VALUE, ++ .cm1ioctl = MT47H128M16RT25E_IOCTRL_VALUE, ++ .cm2ioctl = MT47H128M16RT25E_IOCTRL_VALUE, ++ .dt0ioctl = MT47H128M16RT25E_IOCTRL_VALUE, ++ .dt1ioctl = MT47H128M16RT25E_IOCTRL_VALUE, ++}; ++ ++const struct ctrl_ioregs ioregs_chilisom_gcs2 = { ++ .cm0ioctl = MT41K256M16HA125E_IOCTRL_VALUE, ++ .cm1ioctl = MT41K256M16HA125E_IOCTRL_VALUE, ++ .cm2ioctl = MT41K256M16HA125E_IOCTRL_VALUE, ++ .dt0ioctl = MT41K256M16HA125E_IOCTRL_VALUE, ++ .dt1ioctl = MT41K256M16HA125E_IOCTRL_VALUE, ++}; ++ ++void sdram_init(void) ++{ ++#ifndef CONFIG_CHILISOM_GCS2 ++ config_ddr(266, &ioregs_chilisom_gcs1, ++ &ddr2_chilisom_gcs1_data, ++ &ddr2_chilisom_gcs1_cmd_ctrl_data, ++ &ddr2_chilisom_gcs1_emif_reg_data, 0); ++#else ++ config_ddr(400, &ioregs_chilisom_gcs2, ++ &ddr3_chilisom_gcs2_data, ++ &ddr3_chilisom_gcs2_cmd_ctrl_data, ++ &ddr3_chilisom_gcs2_emif_reg_data, 0); ++#endif ++} ++#endif ++ ++/* ++ * Basic board specific setup. Pinmux has been handled already. ++ */ ++int board_init(void) ++{ ++#if defined(CONFIG_HW_WATCHDOG) ++ hw_watchdog_init(); ++#endif ++ ++ gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; ++#if defined(CONFIG_NOR) || defined(CONFIG_NAND) ++ gpmc_init(); ++#endif ++ return 0; ++} ++ ++#ifdef CONFIG_BOARD_LATE_INIT ++int board_late_init(void) ++{ ++#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG ++ char safe_string[HDR_NAME_LEN + 1]; ++ ++ /* Now set variables based on the header. */ ++ strncpy(safe_string, (char *)"CHILISOM", 8); ++ safe_string[8] = 0; ++ setenv("board_name", safe_string); ++ ++#ifndef CONFIG_CHILISOM_GCS2 ++ strncpy(safe_string, (char *)"1.1", 3); ++ safe_string[3] = 0; ++ setenv("board_rev", safe_string); ++#else ++ strncpy(safe_string, (char *)"2.2", 3); ++ safe_string[3] = 0; ++ setenv("board_rev", safe_string); ++#endif ++#endif ++ return 0; ++} ++#endif ++ ++#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ ++ (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) ++static void cpsw_control(int enabled) ++{ ++ /* VTP can be added here */ ++ ++ return; ++} ++ ++static struct cpsw_slave_data cpsw_slaves[] = { ++ { ++ .slave_reg_ofs = 0x208, ++ .sliver_reg_ofs = 0xd80, ++ .phy_addr = 0, ++ }, ++ { ++ .slave_reg_ofs = 0x308, ++ .sliver_reg_ofs = 0xdc0, ++ .phy_addr = 1, ++ }, ++}; ++ ++static struct cpsw_platform_data cpsw_data = { ++ .mdio_base = CPSW_MDIO_BASE, ++ .cpsw_base = CPSW_BASE, ++ .mdio_div = 0xff, ++ .channels = 8, ++ .cpdma_reg_ofs = 0x800, ++ .slaves = 1, ++ .slave_data = cpsw_slaves, ++ .ale_reg_ofs = 0xd00, ++ .ale_entries = 1024, ++ .host_port_reg_ofs = 0x108, ++ .hw_stats_reg_ofs = 0x900, ++ .bd_ram_ofs = 0x2000, ++ .mac_control = (1 << 5), ++ .control = cpsw_control, ++ .host_port_num = 0, ++ .version = CPSW_CTRL_VERSION_2, ++}; ++#endif ++ ++/* ++ * This function will: ++ * Read the eFuse for MAC addresses, and set ethaddr/eth1addr/usbnet_devaddr ++ * in the environment ++ * Perform fixups to the PHY present on certain boards. We only need this ++ * function in: ++ * - SPL with either CPSW or USB ethernet support ++ * - Full U-Boot, with either CPSW or USB ethernet ++ * Build in only these cases to avoid warnings about unused variables ++ * when we build an SPL that has neither option but full U-Boot will. ++ */ ++ ++#if ((defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)) \ ++ && defined(CONFIG_SPL_BUILD)) || \ ++ ((defined(CONFIG_DRIVER_TI_CPSW) || \ ++ defined(CONFIG_USB_ETHER) && defined(CONFIG_MUSB_GADGET)) && \ ++ !defined(CONFIG_SPL_BUILD)) ++int board_eth_init(bd_t *bis) ++{ ++ int rv, n = 0; ++ uint8_t mac_addr[6]; ++ uint32_t mac_hi, mac_lo; ++ ++ /* try reading mac address from efuse */ ++ mac_lo = readl(&cdev->macid0l); ++ mac_hi = readl(&cdev->macid0h); ++ mac_addr[0] = mac_hi & 0xFF; ++ mac_addr[1] = (mac_hi & 0xFF00) >> 8; ++ mac_addr[2] = (mac_hi & 0xFF0000) >> 16; ++ mac_addr[3] = (mac_hi & 0xFF000000) >> 24; ++ mac_addr[4] = mac_lo & 0xFF; ++ mac_addr[5] = (mac_lo & 0xFF00) >> 8; ++ ++#if (defined(CONFIG_DRIVER_TI_CPSW) && !defined(CONFIG_SPL_BUILD)) || \ ++ (defined(CONFIG_SPL_ETH_SUPPORT) && defined(CONFIG_SPL_BUILD)) ++ if (!getenv("ethaddr")) { ++ printf("<ethaddr> not set. Validating first E-fuse MAC\n"); ++ ++ if (is_valid_ether_addr(mac_addr)) ++ eth_setenv_enetaddr("ethaddr", mac_addr); ++ } ++ ++#ifdef CONFIG_DRIVER_TI_CPSW ++ ++ mac_lo = readl(&cdev->macid1l); ++ mac_hi = readl(&cdev->macid1h); ++ mac_addr[0] = mac_hi & 0xFF; ++ mac_addr[1] = (mac_hi & 0xFF00) >> 8; ++ mac_addr[2] = (mac_hi & 0xFF0000) >> 16; ++ mac_addr[3] = (mac_hi & 0xFF000000) >> 24; ++ mac_addr[4] = mac_lo & 0xFF; ++ mac_addr[5] = (mac_lo & 0xFF00) >> 8; ++ ++ if (!getenv("eth1addr")) { ++ if (is_valid_ether_addr(mac_addr)) ++ eth_setenv_enetaddr("eth1addr", mac_addr); ++ } ++ ++ /* writel(MII_MODE_ENABLE, &cdev->miisel); */ ++ writel(RMII_MODE_ENABLE | RMII_CHIPCKL_ENABLE, &cdev->miisel); ++ ++ cpsw_slaves[0].phy_if = cpsw_slaves[1].phy_if = PHY_INTERFACE_MODE_RMII; ++ ++ rv = cpsw_register(&cpsw_data); ++ if (rv < 0) ++ printf("Error %d registering CPSW switch\n", rv); ++ else ++ n += rv; ++#endif ++#endif ++#if defined(CONFIG_USB_ETHER) && \ ++ (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_USBETH_SUPPORT)) ++ if (is_valid_ether_addr(mac_addr)) ++ eth_setenv_enetaddr("usbnet_devaddr", mac_addr); ++ ++ rv = usb_eth_initialize(bis); ++ if (rv < 0) ++ printf("Error %d registering USB_ETHER\n", rv); ++ else ++ n += rv; ++#endif ++ return n; ++} ++#endif +diff --git a/board/grinn/chiliboard/board.h b/board/grinn/chiliboard/board.h +new file mode 100644 +index 0000000..6753e74 +--- /dev/null ++++ b/board/grinn/chiliboard/board.h +@@ -0,0 +1,20 @@ ++/* ++ * board.h ++ * ++ * Grinn AM335x boards information header ++ * ++ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ ++ * ++ * Copyright (C) 2015, Grinn - http://www.grinn-global.com ++ * Grzegorz Glomb, g.glomb@grinn-global.com ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#ifndef _BOARD_H_ ++#define _BOARD_H_ ++ ++void enable_uart0_pin_mux(void); ++void enable_i2c0_pin_mux(void); ++void enable_board_pin_mux(void); ++#endif +diff --git a/board/grinn/chiliboard/mux.c b/board/grinn/chiliboard/mux.c +new file mode 100644 +index 0000000..644f211 +--- /dev/null ++++ b/board/grinn/chiliboard/mux.c +@@ -0,0 +1,99 @@ ++/* ++ * mux.c ++ * ++ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ ++ * ++ * Copyright (C) 2015, Grinn - http://www.grinn-global.com ++ * Grzegorz Glomb, g.glomb@grinn-global.com ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#include <common.h> ++#include <asm/arch/sys_proto.h> ++#include <asm/arch/hardware.h> ++#include <asm/arch/mux.h> ++#include <asm/io.h> ++#include <i2c.h> ++#include "board.h" ++ ++static struct module_pin_mux uart0_pin_mux[] = { ++ {OFFSET(uart0_rxd), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* UART0_RXD */ ++ {OFFSET(uart0_txd), (MODE(0) | PULLUDEN)}, /* UART0_TXD */ ++ {-1}, ++}; ++ ++static struct module_pin_mux mmc0_pin_mux[] = { ++ {OFFSET(mmc0_dat3), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT3 */ ++ {OFFSET(mmc0_dat2), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT2 */ ++ {OFFSET(mmc0_dat1), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT1 */ ++ {OFFSET(mmc0_dat0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_DAT0 */ ++ {OFFSET(mmc0_clk), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_CLK */ ++ {OFFSET(mmc0_cmd), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* MMC0_CMD */ ++ {-1}, ++}; ++ ++static struct module_pin_mux i2c0_pin_mux[] = { ++ {OFFSET(i2c0_sda), (MODE(0) | RXACTIVE | ++ PULLUDEN | SLEWCTRL)}, /* I2C_DATA */ ++ {OFFSET(i2c0_scl), (MODE(0) | RXACTIVE | ++ PULLUDEN | SLEWCTRL)}, /* I2C_SCLK */ ++ {-1}, ++}; ++ ++static struct module_pin_mux rmii1_pin_mux[] = { ++ {OFFSET(mii1_crs), MODE(1) | RXACTIVE}, /* RMII1_CRS */ ++ {OFFSET(mii1_rxerr), MODE(1) | RXACTIVE}, /* RMII1_RXERR */ ++ {OFFSET(mii1_txen), MODE(1)}, /* RMII1_TXEN */ ++ {OFFSET(mii1_txd1), MODE(1)}, /* RMII1_TXD1 */ ++ {OFFSET(mii1_txd0), MODE(1)}, /* RMII1_TXD0 */ ++ {OFFSET(mii1_rxd1), MODE(1) | RXACTIVE}, /* RMII1_RXD1 */ ++ {OFFSET(mii1_rxd0), MODE(1) | RXACTIVE}, /* RMII1_RXD0 */ ++ {OFFSET(mdio_data), MODE(0) | RXACTIVE | PULLUP_EN}, /* MDIO_DATA */ ++ {OFFSET(mdio_clk), MODE(0) | PULLUP_EN}, /* MDIO_CLK */ ++ {OFFSET(rmii1_refclk), MODE(0) | RXACTIVE}, /* RMII1_REFCLK */ ++ {-1}, ++}; ++ ++static struct module_pin_mux nand_pin_mux[] = { ++ {OFFSET(gpmc_ad0), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD0 */ ++ {OFFSET(gpmc_ad1), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD1 */ ++ {OFFSET(gpmc_ad2), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD2 */ ++ {OFFSET(gpmc_ad3), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD3 */ ++ {OFFSET(gpmc_ad4), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD4 */ ++ {OFFSET(gpmc_ad5), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD5 */ ++ {OFFSET(gpmc_ad6), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD6 */ ++ {OFFSET(gpmc_ad7), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD7 */ ++ {OFFSET(gpmc_wait0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* NAND WAIT */ ++ {OFFSET(gpmc_wpn), (MODE(7) | PULLUP_EN | RXACTIVE)}, /* NAND_WPN */ ++ {OFFSET(gpmc_csn0), (MODE(0) | PULLUDEN)}, /* NAND_CS0 */ ++ {OFFSET(gpmc_advn_ale), (MODE(0) | PULLUDEN)}, /* NAND_ADV_ALE */ ++ {OFFSET(gpmc_oen_ren), (MODE(0) | PULLUDEN)}, /* NAND_OE */ ++ {OFFSET(gpmc_wen), (MODE(0) | PULLUDEN)}, /* NAND_WEN */ ++ {OFFSET(gpmc_be0n_cle), (MODE(0) | PULLUDEN)}, /* NAND_BE_CLE */ ++ {-1}, ++}; ++ ++void enable_uart0_pin_mux(void) ++{ ++ configure_module_pin_mux(uart0_pin_mux); ++} ++ ++void enable_i2c0_pin_mux(void) ++{ ++ configure_module_pin_mux(i2c0_pin_mux); ++} ++ ++void enable_board_pin_mux(void) ++{ ++ /* chiliboard pinmux */ ++ configure_module_pin_mux(rmii1_pin_mux); ++ configure_module_pin_mux(nand_pin_mux); ++ configure_module_pin_mux(mmc0_pin_mux); ++ ++#ifndef CONFIG_CHILISOM_GCS2 ++ puts("Configuration for Chilisom GCS1\n"); ++#else ++ puts("Configuration for Chilisom GCS2\n"); ++#endif ++} +diff --git a/board/grinn/chiliboard/u-boot.lds b/board/grinn/chiliboard/u-boot.lds +new file mode 100644 +index 0000000..bf70d88 +--- /dev/null ++++ b/board/grinn/chiliboard/u-boot.lds +@@ -0,0 +1,131 @@ ++/* ++ * Copyright (c) 2004-2008 Texas Instruments ++ * ++ * (C) Copyright 2002 ++ * Gary Jennejohn, DENX Software Engineering, <garyj@denx.de> ++ * ++ * Copyright (C) 2015, Grinn - http://www.grinn-global.com ++ * Grzegorz Glomb, g.glomb@grinn-global.com ++ * ++ * See file CREDITS for list of people who contributed to this ++ * project. ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU General Public License as ++ * published by the Free Software Foundation; either version 2 of ++ * the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program; if not, write to the Free Software ++ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, ++ * MA 02111-1307 USA ++ */ ++ ++OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm") ++OUTPUT_ARCH(arm) ++ENTRY(_start) ++SECTIONS ++{ ++ . = 0x00000000; ++ ++ . = ALIGN(4); ++ .text : ++ { ++ *(.__image_copy_start) ++ *(.vectors) ++ CPUDIR/start.o (.text*) ++ board/grinn/chiliboard/built-in.o (.text*) ++ *(.text*) ++ } ++ ++ . = ALIGN(4); ++ .rodata : { *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*))) } ++ ++ . = ALIGN(4); ++ .data : { ++ *(.data*) ++ } ++ ++ . = ALIGN(4); ++ ++ . = .; ++ ++ . = ALIGN(4); ++ .u_boot_list : { ++ KEEP(*(SORT(.u_boot_list*))); ++ } ++ ++ . = ALIGN(4); ++ ++ .image_copy_end : ++ { ++ *(.__image_copy_end) ++ } ++ ++ .rel_dyn_start : ++ { ++ *(.__rel_dyn_start) ++ } ++ ++ .rel.dyn : { ++ *(.rel*) ++ } ++ ++ .rel_dyn_end : ++ { ++ *(.__rel_dyn_end) ++ } ++ ++ .hash : { *(.hash*) } ++ ++ .end : ++ { ++ *(.__end) ++ } ++ ++ _image_binary_end = .; ++ ++ /* ++ * Deprecated: this MMU section is used by pxa at present but ++ * should not be used by new boards/CPUs. ++ */ ++ . = ALIGN(4096); ++ .mmutable : { ++ *(.mmutable) ++ } ++ ++/* ++ * Compiler-generated __bss_start and __bss_end, see arch/arm/lib/bss.c ++ * __bss_base and __bss_limit are for linker only (overlay ordering) ++ */ ++ ++ .bss_start __rel_dyn_start (OVERLAY) : { ++ KEEP(*(.__bss_start)); ++ __bss_base = .; ++ } ++ ++ .bss __bss_base (OVERLAY) : { ++ *(.bss*) ++ . = ALIGN(4); ++ __bss_limit = .; ++ } ++ ++ .bss_end __bss_limit (OVERLAY) : { ++ KEEP(*(.__bss_end)); ++ } ++ ++ .dynsym _image_binary_end : { *(.dynsym) } ++ .dynbss : { *(.dynbss) } ++ .dynstr : { *(.dynstr*) } ++ .dynamic : { *(.dynamic*) } ++ .gnu.hash : { *(.gnu.hash) } ++ .plt : { *(.plt*) } ++ .interp : { *(.interp*) } ++ .gnu : { *(.gnu*) } ++ .ARM.exidx : { *(.ARM.exidx*) } ++} +diff --git a/boards.cfg b/boards.cfg +index 1ba2081..b432704 100644 +--- a/boards.cfg ++++ b/boards.cfg +@@ -258,6 +258,11 @@ Active arm armv7 am33xx BuR tseries + Active arm armv7 am33xx BuR tseries tseries_nand tseries:SERIAL1,CONS_INDEX=1,NAND Hannes Petermaier <hannes.petermaier@br-automation.com> + Active arm armv7 am33xx BuR tseries tseries_spi tseries:SERIAL1,CONS_INDEX=1,SPI_BOOT,EMMC_BOOT Hannes Petermaier <hannes.petermaier@br-automation.com> + Active arm armv7 am33xx compulab cm_t335 cm_t335 - Igor Grinberg <grinberg@compulab.co.il> ++Active arm armv7 am33xx grinn chiliboard chiliboard_ram128m chiliboard:CHILISOM_GCS2,NAND,RAM128MB Grzegorz Glomb <g.glomb@grinn-global.com> ++Active arm armv7 am33xx grinn chiliboard chiliboard_nand0m_ram128m chiliboard:CHILISOM_GCS2,RAM128MB Grzegorz Glomb <g.glomb@grinn-global.com> ++Active arm armv7 am33xx grinn chiliboard chiliboard_nand512m chiliboard:CHILISOM_GCS2,NAND,NAND512MB Grzegorz Glomb <g.glomb@grinn-global.com> ++Active arm armv7 am33xx grinn chiliboard chiliboard_nand0m chiliboard:CHILISOM_GCS2 Grzegorz Glomb <g.glomb@grinn-global.com> ++Active arm armv7 am33xx grinn chiliboard chiliboard chiliboard:CHILISOM_GCS2,NAND Grzegorz Glomb <g.glomb@grinn-global.com> + Active arm armv7 am33xx gumstix pepper pepper - Ash Charles <ash@gumstix.com> + Active arm armv7 am33xx isee igep0033 am335x_igep0033 - Enric Balletbo i Serra <eballetbo@iseebcn.com> + Active arm armv7 am33xx phytec pcm051 pcm051_rev1 pcm051:REV1 Lars Poeschel <poeschel@lemonage.de> +diff --git a/drivers/mtd/nand/omap_gpmc.c b/drivers/mtd/nand/omap_gpmc.c +index 1acf06b..0c9cde3 100644 +--- a/drivers/mtd/nand/omap_gpmc.c ++++ b/drivers/mtd/nand/omap_gpmc.c +@@ -478,11 +478,13 @@ static int omap_read_page_bch(struct mtd_info *mtd, struct nand_chip *chip, + oob += eccbytes) { + chip->ecc.hwctl(mtd, NAND_ECC_READ); + /* read data */ +- chip->cmdfunc(mtd, NAND_CMD_RNDOUT, data_pos, page); ++ /* chip->cmdfunc(mtd, NAND_CMD_RNDOUT, data_pos, page); */ ++ chip->cmdfunc(mtd, NAND_CMD_RNDOUT, data_pos, -1); + chip->read_buf(mtd, p, eccsize); + + /* read respective ecc from oob area */ +- chip->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_pos, page); ++ /* chip->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_pos, page); */ ++ chip->cmdfunc(mtd, NAND_CMD_RNDOUT, oob_pos, -1); + chip->read_buf(mtd, oob, eccbytes); + /* read syndrome */ + chip->ecc.calculate(mtd, p, &ecc_calc[i]); +diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h +new file mode 100644 +index 0000000..eacc9af +--- /dev/null ++++ b/include/configs/chiliboard.h +@@ -0,0 +1,878 @@ ++/* ++ * chiliboard.h ++ * ++ * Grinn chiliboard configuration header ++ * ++ * Copyright (C) 2011, Texas Instruments, Incorporated - http://www.ti.com/ ++ * ++ * Copyright (C) 2015, Grinn - http://www.grinn-global.com ++ * Grzegorz Glomb, g.glomb@grinn-global.com ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++#ifndef __CONFIG_CHILIBOARD_H ++#define __CONFIG_CHILIBOARD_H ++ ++#define CONFIG_AM33XX ++#define CONFIG_ARCH_CPU_INIT ++#define CONFIG_SYS_CACHELINE_SIZE 64 ++#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ ++#define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */ ++#define CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC ++ ++#include <asm/arch/omap.h> ++ ++/* NS16550 Configuration */ ++#define CONFIG_SYS_NS16550 ++#define CONFIG_SYS_NS16550_SERIAL ++#define CONFIG_SYS_NS16550_REG_SIZE (-4) ++#define CONFIG_SYS_NS16550_CLK 48000000 ++ ++/* Network defines. */ ++#define CONFIG_CMD_NET /* 'bootp' and 'tftp' */ ++#define CONFIG_CMD_DHCP ++#define CONFIG_CMD_MII ++#define CONFIG_BOOTP_DNS /* Configurable parts of CMD_DHCP */ ++#define CONFIG_BOOTP_DNS2 ++#define CONFIG_BOOTP_SEND_HOSTNAME ++#define CONFIG_BOOTP_GATEWAY ++#define CONFIG_BOOTP_SUBNETMASK ++#define CONFIG_NET_RETRY_COUNT 10 ++#define CONFIG_CMD_PING ++#define CONFIG_DRIVER_TI_CPSW /* Driver for IP block */ ++#define CONFIG_MII /* Required in net/eth.c */ ++ ++/* ++ * RTC related defines. To use bootcount you must set bootlimit in the ++ * environment to a non-zero value and enable CONFIG_BOOTCOUNT_LIMIT ++ * in the board config. ++ */ ++#define CONFIG_SYS_BOOTCOUNT_ADDR 0x44E3E000 ++ ++/* Enable the HW watchdog, since we can use this with bootcount */ ++#define CONFIG_HW_WATCHDOG ++#define CONFIG_OMAP_WATCHDOG ++ ++/* ++ * SPL related defines. The Public RAM memory map the ROM defines the ++ * area between 0x402F0400 and 0x4030B800 as a download area and ++ * 0x4030B800 to 0x4030CE00 as a public stack area. The ROM also ++ * supports X-MODEM loading via UART, and we leverage this and then use ++ * Y-MODEM to load u-boot.img, when booted over UART. ++ */ ++#define CONFIG_SPL_TEXT_BASE 0x402F0400 ++#define CONFIG_SPL_MAX_SIZE (0x4030B800 - CONFIG_SPL_TEXT_BASE) ++#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ ++ (128 << 20)) ++ ++/* Enable the watchdog inside of SPL */ ++#define CONFIG_SPL_WATCHDOG_SUPPORT ++ ++/* ++ * Since SPL did pll and ddr initialization for us, ++ * we don't need to do it twice. ++ */ ++#if !defined(CONFIG_SPL_BUILD) && !defined(CONFIG_NOR_BOOT) ++#define CONFIG_SKIP_LOWLEVEL_INIT ++#endif ++ ++/* ++ * When building U-Boot such that there is no previous loader ++ * we need to call board_early_init_f. This is taken care of in ++ * s_init when we have SPL used. ++ */ ++#if !defined(CONFIG_SKIP_LOWLEVEL_INIT) && !defined(CONFIG_SPL) ++#define CONFIG_BOARD_EARLY_INIT_F ++#endif ++ ++#ifdef CONFIG_NAND ++#define CONFIG_SPL_NAND_AM33XX_BCH /* ELM support */ ++#endif ++ ++/* Common define for many platforms. */ ++#define CONFIG_OMAP ++#define CONFIG_OMAP_COMMON ++#define CONFIG_SYS_GENERIC_BOARD ++ ++/* ++ * We typically do not contain NOR flash. In the cases where we do, we ++ * undefine this later. ++ */ ++#define CONFIG_SYS_NO_FLASH ++ ++/* Support both device trees and ATAGs. */ ++#define CONFIG_OF_LIBFDT ++#define CONFIG_CMDLINE_TAG ++#define CONFIG_SETUP_MEMORY_TAGS ++#define CONFIG_INITRD_TAG ++ ++/* ++ * Our DDR memory always starts at 0x80000000 and U-Boot shall have ++ * relocated itself to higher in memory by the time this value is used. ++ * However, set this to a 32MB offset to allow for easier Linux kernel ++ * booting as the default is often used as the kernel load address. ++ */ ++#define CONFIG_SYS_LOAD_ADDR 0x82000000 ++ ++/* ++ * We setup defaults based on constraints from the Linux kernel, which should ++ * also be safe elsewhere. We have the default load at 32MB into DDR (for ++ * the kernel), FDT above 128MB (the maximum location for the end of the ++ * kernel), and the ramdisk 512KB above that (allowing for hopefully never ++ * seen large trees). We say all of this must be within the first 256MB ++ * as that will normally be within the kernel lowmem and thus visible via ++ * bootm_size and we only run on platforms with 256MB or more of memory. ++ */ ++#ifdef CONFIG_RAM128MB ++#define DEFAULT_LINUX_BOOT_ENV \ ++ "loadaddr=0x82000000\0" \ ++ "kernel_addr_r=0x82000000\0" \ ++ "fdtaddr=0x84000000\0" \ ++ "fdt_addr_r=0x84000000\0" \ ++ "rdaddr=0x84080000\0" \ ++ "ramdisk_addr_r=0x84080000\0" \ ++ "bootm_size=0x8000000\0" ++#else ++#define DEFAULT_LINUX_BOOT_ENV \ ++ "loadaddr=0x82000000\0" \ ++ "kernel_addr_r=0x82000000\0" \ ++ "fdtaddr=0x88000000\0" \ ++ "fdt_addr_r=0x88000000\0" \ ++ "rdaddr=0x88080000\0" \ ++ "ramdisk_addr_r=0x88080000\0" \ ++ "bootm_size=0x10000000\0" ++#endif ++ ++/* ++ * Default to a quick boot delay. ++ */ ++#define CONFIG_BOOTDELAY 1 ++ ++/* ++ * DDR information. If the CONFIG_NR_DRAM_BANKS is not defined, ++ * we say (for simplicity) that we have 1 bank, always, even when ++ * we have more. We always start at 0x80000000, and we place the ++ * initial stack pointer in our SRAM. Otherwise, we can define ++ * CONFIG_NR_DRAM_BANKS before including this file. ++ */ ++#ifndef CONFIG_NR_DRAM_BANKS ++#define CONFIG_NR_DRAM_BANKS 1 ++#endif ++#define CONFIG_SYS_SDRAM_BASE 0x80000000 ++#define CONFIG_SYS_INIT_SP_ADDR (NON_SECURE_SRAM_END - \ ++ GENERATED_GBL_DATA_SIZE) ++ ++/* Timer information. */ ++#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */ ++ ++/* I2C IP block */ ++#define CONFIG_I2C ++#define CONFIG_CMD_I2C ++#define CONFIG_SYS_I2C ++#define CONFIG_SYS_OMAP24_I2C_SPEED 100000 ++#define CONFIG_SYS_OMAP24_I2C_SLAVE 1 ++#define CONFIG_SYS_I2C_OMAP24XX ++ ++/* MMC/SD IP block */ ++#define CONFIG_MMC ++#define CONFIG_GENERIC_MMC ++#define CONFIG_OMAP_HSMMC ++#define CONFIG_CMD_MMC ++ ++/* McSPI IP block */ ++#define CONFIG_SPI ++#define CONFIG_OMAP3_SPI ++#define CONFIG_CMD_SPI ++ ++/* GPIO block */ ++#define CONFIG_OMAP_GPIO ++#define CONFIG_CMD_GPIO ++ ++/* ++ * GPMC NAND block. We support 1 device and the physical address to ++ * access CS0 at is 0x8000000. ++ */ ++#ifdef CONFIG_NAND ++#define CONFIG_NAND_OMAP_GPMC ++#ifndef CONFIG_SYS_NAND_BASE ++#define CONFIG_SYS_NAND_BASE 0x8000000 ++#endif ++#define CONFIG_SYS_MAX_NAND_DEVICE 1 ++#define CONFIG_CMD_NAND ++#endif ++ ++/* ++ * The following are general good-enough settings for U-Boot. We set a ++ * large malloc pool as we generally have a lot of DDR, and we opt for ++ * function over binary size in the main portion of U-Boot as this is ++ * generally easily constrained later if needed. We enable the config ++ * options that give us information in the environment about what board ++ * we are on so we do not need to rely on the command prompt. We set a ++ * console baudrate of 115200 and use the default baud rate table. ++ */ ++#define CONFIG_SYS_MALLOC_LEN (16 << 20) ++#define CONFIG_SYS_HUSH_PARSER ++#define CONFIG_SYS_PROMPT "U-Boot# " ++#define CONFIG_SYS_CONSOLE_INFO_QUIET ++#define CONFIG_BAUDRATE 115200 ++#define CONFIG_ENV_VARS_UBOOT_CONFIG /* Strongly encouraged */ ++#define CONFIG_ENV_OVERWRITE /* Overwrite ethaddr / serial# */ ++ ++/* As stated above, the following choices are optional. */ ++#define CONFIG_SYS_LONGHELP ++#define CONFIG_AUTO_COMPLETE ++#define CONFIG_CMDLINE_EDITING ++#define CONFIG_VERSION_VARIABLE ++ ++/* We set the max number of command args high to avoid HUSH bugs. */ ++#define CONFIG_SYS_MAXARGS 64 ++ ++/* Console I/O Buffer Size */ ++#define CONFIG_SYS_CBSIZE 512 ++/* Print Buffer Size */ ++#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ ++ + sizeof(CONFIG_SYS_PROMPT) + 16) ++/* Boot Argument Buffer Size */ ++#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE ++ ++/* ++ * When we have SPI, NOR or NAND flash we expect to be making use of ++ * mtdparts, both for ease of use in U-Boot and for passing information ++ * on to the Linux kernel. ++ */ ++#if defined(CONFIG_SPI_BOOT) || defined(CONFIG_NOR) || defined(CONFIG_NAND) ++#define CONFIG_MTD_DEVICE /* Required for mtdparts */ ++#define CONFIG_CMD_MTDPARTS ++#endif ++ ++/* ++ * For commands to use, we take the default list and add a few other ++ * useful commands. Note that we must have set CONFIG_SYS_NO_FLASH ++ * prior to this include, in order to skip a few commands. When we do ++ * have flash, if we expect these commands they must be enabled in that ++ * config. If desired, a specific list of desired commands can be used ++ * instead. ++ */ ++#include <config_cmd_default.h> ++#define CONFIG_CMD_ASKENV ++#define CONFIG_CMD_ECHO ++#define CONFIG_CMD_BOOTZ ++ ++/* ++ * Common filesystems support. When we have removable storage we ++ * enabled a number of useful commands and support. ++ */ ++#if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE) ++#define CONFIG_DOS_PARTITION ++#define CONFIG_CMD_FAT ++#define CONFIG_FAT_WRITE ++#define CONFIG_CMD_EXT2 ++#define CONFIG_CMD_EXT4 ++#define CONFIG_CMD_FS_GENERIC ++#endif ++ ++/* ++ * Our platforms make use of SPL to initalize the hardware (primarily ++ * memory) enough for full U-Boot to be loaded. We also support Falcon ++ * Mode so that the Linux kernel can be booted directly from SPL ++ * instead, if desired. We make use of the general SPL framework found ++ * under common/spl/. Given our generally common memory map, we set a ++ * number of related defaults and sizes here. ++ */ ++#if !defined(CONFIG_NOR_BOOT) && \ ++ !(defined(CONFIG_QSPI_BOOT) && defined(CONFIG_AM43XX)) ++#define CONFIG_SPL ++#define CONFIG_SPL_FRAMEWORK ++#define CONFIG_SPL_OS_BOOT ++ ++/* ++ * Place the image at the start of the ROM defined image space. ++ * We limit our size to the ROM-defined downloaded image area, and use the ++ * rest of the space for stack. We load U-Boot itself into memory at ++ * 0x80800000 for legacy reasons (to not conflict with older SPLs). We ++ * have our BSS be placed 1MiB after this, to allow for the default ++ * Linux kernel address of 0x80008000 to work, in the Falcon Mode case. ++ * We have the SPL malloc pool at the end of the BSS area. ++ */ ++#define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR ++#ifndef CONFIG_SYS_TEXT_BASE ++#define CONFIG_SYS_TEXT_BASE 0x80800000 ++#endif ++#ifndef CONFIG_SPL_BSS_START_ADDR ++#define CONFIG_SPL_BSS_START_ADDR 0x80a00000 ++#define CONFIG_SPL_BSS_MAX_SIZE 0x80000 /* 512 KB */ ++#endif ++#ifndef CONFIG_SYS_SPL_MALLOC_START ++#define CONFIG_SYS_SPL_MALLOC_START (CONFIG_SPL_BSS_START_ADDR + \ ++ CONFIG_SPL_BSS_MAX_SIZE) ++#define CONFIG_SYS_SPL_MALLOC_SIZE CONFIG_SYS_MALLOC_LEN ++#endif ++ ++/* RAW SD card / eMMC locations. */ ++#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */ ++#define CONFIG_SYS_U_BOOT_MAX_SIZE_SECTORS 0x200 /* 256 KB */ ++ ++/* FAT sd card locations. */ ++#define CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION 1 ++#define CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME "u-boot.img" ++ ++#ifdef CONFIG_SPL_OS_BOOT ++/* FAT */ ++#define CONFIG_SPL_FAT_LOAD_KERNEL_NAME "uImage" ++#define CONFIG_SPL_FAT_LOAD_ARGS_NAME "args" ++ ++/* RAW SD card / eMMC */ ++#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR 0x900 /* address 0x120000 */ ++#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0x80 /* address 0x10000 */ ++#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0x80 /* 64KiB */ ++ ++/* NAND */ ++#ifdef CONFIG_NAND ++#define CONFIG_CMD_SPL_NAND_OFS 0x240000 /* end of u-boot */ ++#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 ++#define CONFIG_CMD_SPL_WRITE_SIZE 0x2000 ++#endif ++ ++/* spl export command */ ++#define CONFIG_CMD_SPL ++#endif ++ ++#ifdef CONFIG_MMC ++#define CONFIG_SPL_LIBDISK_SUPPORT ++#define CONFIG_SPL_MMC_SUPPORT ++#define CONFIG_SPL_FAT_SUPPORT ++#endif ++ ++/* General parts of the framework, required. */ ++#define CONFIG_SPL_I2C_SUPPORT ++#define CONFIG_SPL_LIBCOMMON_SUPPORT ++#define CONFIG_SPL_LIBGENERIC_SUPPORT ++#define CONFIG_SPL_SERIAL_SUPPORT ++#define CONFIG_SPL_GPIO_SUPPORT ++#define CONFIG_SPL_BOARD_INIT ++ ++#ifdef CONFIG_NAND ++#define CONFIG_SPL_NAND_SUPPORT ++#define CONFIG_SPL_NAND_BASE ++#define CONFIG_SPL_NAND_DRIVERS ++#define CONFIG_SPL_NAND_ECC ++#define CONFIG_SPL_MTD_SUPPORT ++#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE ++/* #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 */ /* Defined later in this configuration */ ++#endif ++#endif /* !CONFIG_NOR_BOOT */ ++ ++#ifndef CONFIG_SPL_BUILD ++# define CONFIG_FIT ++# define CONFIG_TIMESTAMP ++# define CONFIG_LZO ++# ifdef CONFIG_ENABLE_VBOOT ++# define CONFIG_OF_CONTROL ++# define CONFIG_OF_SEPARATE ++# define CONFIG_DEFAULT_DEVICE_TREE am335x-chiliboard ++# define CONFIG_FIT_SIGNATURE ++# define CONFIG_RSA ++# endif ++#endif ++ ++#define CONFIG_SYS_BOOTM_LEN (16 << 20) ++ ++#define CONFIG_BOARD_LATE_INIT ++ ++#define CONFIG_SERIAL1 1 ++#define CONFIG_CONS_INDEX 1 ++ ++/* Clock Defines */ ++#define V_OSCK 24000000 /* Clock output from T2 */ ++#define V_SCLK (V_OSCK) ++ ++/* Custom script for NOR */ ++#define CONFIG_SYS_LDSCRIPT "board/grinn/chiliboard/u-boot.lds" ++ ++/* Always 128 KiB env size */ ++#define CONFIG_ENV_SIZE (128 << 10) ++ ++/* Enhance our eMMC support / experience. */ ++#define CONFIG_CMD_GPT ++#define CONFIG_EFI_PARTITION ++#define CONFIG_PARTITION_UUIDS ++#define CONFIG_CMD_PART ++ ++#ifdef CONFIG_NAND ++#ifndef CONFIG_NAND512MB ++#define NANDARGS \ ++ "mtdids=" MTDIDS_DEFAULT "\0" \ ++ "mtdparts=" MTDPARTS_DEFAULT "\0" \ ++ "nandargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=${nandroot} " \ ++ "rootfstype=${nandrootfstype}\0" \ ++ "nandroot=ubi0:rootfs rw ubi.mtd=8,2048\0" \ ++ "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandboot=echo Booting from nand ...; " \ ++ "run nandargs; " \ ++ "nand read ${fdtaddr} u-boot-spl-os; " \ ++ "nand read ${loadaddr} kernel; " \ ++ "bootz ${loadaddr} - ${fdtaddr}\0" ++#else ++#define NANDARGS \ ++ "mtdids=" MTDIDS_DEFAULT "\0" \ ++ "mtdparts=" MTDPARTS_DEFAULT "\0" \ ++ "nandargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=${nandroot} " \ ++ "rootfstype=${nandrootfstype}\0" \ ++ "nandroot=ubi0:rootfs rw ubi.mtd=8,4096\0" \ ++ "nandrootfstype=ubifs rootwait=1\0" \ ++ "nandboot=echo Booting from nand ...; " \ ++ "run nandargs; " \ ++ "nand read ${fdtaddr} u-boot-spl-os; " \ ++ "nand read ${loadaddr} kernel; " \ ++ "bootz ${loadaddr} - ${fdtaddr}\0" ++#endif ++#else ++#define NANDARGS "" ++#endif ++ ++#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG ++ ++#ifndef CONFIG_SPL_BUILD ++#define CONFIG_EXTRA_ENV_SETTINGS \ ++ DEFAULT_LINUX_BOOT_ENV \ ++ "boot_fdt=try\0" \ ++ "bootpart=0:2\0" \ ++ "bootdir=/boot\0" \ ++ "bootfile=zImage\0" \ ++ "fdtfile=undefined\0" \ ++ "console=ttyO0,115200n8\0" \ ++ "partitions=" \ ++ "uuid_disk=${uuid_gpt_disk};" \ ++ "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ ++ "optargs=\0" \ ++ "mmcdev=0\0" \ ++ "mmcroot=/dev/mmcblk0p2 rw\0" \ ++ "mmcrootfstype=ext4 rootwait\0" \ ++ "rootpath=/export/rootfs\0" \ ++ "nfsopts=nolock\0" \ ++ "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ ++ "::off\0" \ ++ "ramroot=/dev/ram0 rw\0" \ ++ "ramrootfstype=ext2\0" \ ++ "mmcargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=${mmcroot} " \ ++ "rootfstype=${mmcrootfstype}\0" \ ++ "spiroot=/dev/mtdblock4 rw\0" \ ++ "spirootfstype=jffs2\0" \ ++ "spisrcaddr=0xe0000\0" \ ++ "spiimgsize=0x362000\0" \ ++ "spibusno=0\0" \ ++ "spiargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=${spiroot} " \ ++ "rootfstype=${spirootfstype}\0" \ ++ "netargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=/dev/nfs " \ ++ "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ ++ "ip=dhcp\0" \ ++ "bootenv=uEnv.txt\0" \ ++ "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ ++ "importbootenv=echo Importing environment from mmc ...; " \ ++ "env import -t $loadaddr $filesize\0" \ ++ "ramargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=${ramroot} " \ ++ "rootfstype=${ramrootfstype}\0" \ ++ "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ ++ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ ++ "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ ++ "mmcloados=run mmcargs; " \ ++ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ ++ "if run loadfdt; then " \ ++ "bootz ${loadaddr} - ${fdtaddr}; " \ ++ "else " \ ++ "if test ${boot_fdt} = try; then " \ ++ "bootz; " \ ++ "else " \ ++ "echo WARN: Cannot load the DT; " \ ++ "fi; " \ ++ "fi; " \ ++ "else " \ ++ "bootz; " \ ++ "fi;\0" \ ++ "mmcboot=mmc dev ${mmcdev}; " \ ++ "if mmc rescan; then " \ ++ "echo SD/MMC found on device ${mmcdev};" \ ++ "if run loadbootenv; then " \ ++ "echo Loaded environment from ${bootenv};" \ ++ "run importbootenv;" \ ++ "fi;" \ ++ "if test -n $uenvcmd; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "if run loadimage; then " \ ++ "run mmcloados;" \ ++ "fi;" \ ++ "fi;\0" \ ++ "spiboot=echo Booting from spi ...; " \ ++ "run spiargs; " \ ++ "sf probe ${spibusno}:0; " \ ++ "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \ ++ "bootz ${loadaddr}\0" \ ++ "netboot=echo Booting from network ...; " \ ++ "setenv autoload no; " \ ++ "dhcp; " \ ++ "tftp ${loadaddr} ${bootfile}; " \ ++ "tftp ${fdtaddr} ${fdtfile}; " \ ++ "run netargs; " \ ++ "bootz ${loadaddr} - ${fdtaddr}\0" \ ++ "ramboot=echo Booting from ramdisk ...; " \ ++ "run ramargs; " \ ++ "bootz ${loadaddr} ${rdaddr} ${fdtaddr}\0" \ ++ "findfdt="\ ++ "setenv fdtfile am335x-chiliboard.dtb;\0" \ ++ NANDARGS \ ++ DFUARGS ++#endif ++ ++#define CONFIG_BOOTCOMMAND \ ++ "run findfdt; " \ ++ "run mmcboot;" \ ++ "setenv mmcdev 1; " \ ++ "setenv bootpart 1:2; " \ ++ "run mmcboot;" \ ++ "run nandboot;" ++ ++/* NS16550 Configuration */ ++#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */ ++#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ ++#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */ ++#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ ++#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ ++#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ ++#define CONFIG_BAUDRATE 115200 ++ ++/* ++#define CONFIG_CMD_EEPROM ++#define CONFIG_ENV_EEPROM_IS_ON_I2C ++#define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 ++#define CONFIG_SYS_I2C_EEPROM_ADDR_LEN 2 ++#define CONFIG_SYS_I2C_MULTI_EEPROMS ++*/ ++ ++/* PMIC support */ ++#define CONFIG_POWER_TPS65217 ++/* #define CONFIG_POWER_TPS65910 */ ++ ++/* SPL */ ++#ifndef CONFIG_NOR_BOOT ++#define CONFIG_SPL_POWER_SUPPORT ++#define CONFIG_SPL_YMODEM_SUPPORT ++ ++/* Bootcount using the RTC block */ ++#define CONFIG_BOOTCOUNT_LIMIT ++#define CONFIG_BOOTCOUNT_AM33XX ++ ++/* USB gadget RNDIS */ ++#define CONFIG_SPL_MUSB_NEW_SUPPORT ++ ++/* General network SPL, both CPSW and USB gadget RNDIS */ ++#define CONFIG_SPL_NET_SUPPORT ++#define CONFIG_SPL_ENV_SUPPORT ++#define CONFIG_SPL_NET_VCI_STRING "AM335x U-Boot SPL" ++ ++#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/am33xx/u-boot-spl.lds" ++ ++#ifdef CONFIG_NAND ++#define CONFIG_NAND_OMAP_GPMC ++#define CONFIG_NAND_OMAP_ELM ++#define CONFIG_SYS_NAND_5_ADDR_CYCLE ++#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ ++ CONFIG_SYS_NAND_PAGE_SIZE) ++ ++#ifndef CONFIG_NAND512MB ++#define CONFIG_SYS_NAND_PAGE_SIZE 2048 ++#define CONFIG_SYS_NAND_OOBSIZE 64 ++#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) ++#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS ++#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ ++ 10, 11, 12, 13, 14, 15, 16, 17, \ ++ 18, 19, 20, 21, 22, 23, 24, 25, \ ++ 26, 27, 28, 29, 30, 31, 32, 33, \ ++ 34, 35, 36, 37, 38, 39, 40, 41, \ ++ 42, 43, 44, 45, 46, 47, 48, 49, \ ++ 50, 51, 52, 53, 54, 55, 56, 57, } ++ ++#define CONFIG_SYS_NAND_ECCSIZE 512 ++#define CONFIG_SYS_NAND_ECCBYTES 14 ++#define CONFIG_SYS_NAND_ONFI_DETECTION ++#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW ++#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE ++#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 ++#else ++#define CONFIG_SYS_NAND_PAGE_SIZE 4096 ++#define CONFIG_SYS_NAND_OOBSIZE 224 ++#define CONFIG_SYS_NAND_BLOCK_SIZE (256*1024) ++#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS ++#define CONFIG_SYS_NAND_ECCPOS {\ ++ 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,\ ++ 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,\ ++ 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39,\ ++ 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,\ ++ 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63,\ ++ 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,\ ++ 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,\ ++ 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99,\ ++ 100, 101, 102, 103, 104, 105, 106, 107, 108, 109,\ ++ 110, 111, 112, 113, 114, 115, 116, 117, 118, 119,\ ++ 120, 121, 122, 123, 124, 125, 126, 127, 128, 129,\ ++ 130, 131, 132, 133, 134, 135, 136, 137, 138, 139,\ ++ 140, 141, 142, 143, 144, 145, 146, 147, 148, 149,\ ++ 150, 151, 152, 153, 154, 155, 156, 157, 158, 159,\ ++ 160, 161, 162, 163, 164, 165, 166, 167, 168, 169,\ ++ 170, 171, 172, 173, 174, 175, 176, 177, 178, 179,\ ++ 180, 181, 182, 183, 184, 185, 186, 187, 188, 189,\ ++ 190, 191, 192, 193, 194, 195, 196, 197, 198, 199,\ ++ 200, 201, 202, 203, 204, 205, 206, 207, 208, 209} ++ ++#define CONFIG_SYS_NAND_ECCSIZE 512 ++#define CONFIG_SYS_NAND_ECCBYTES 26 ++#define CONFIG_SYS_NAND_ONFI_DETECTION ++#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH16_CODE_HW ++#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE ++#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x100000 ++#endif ++ ++#endif ++#endif ++ ++/* ++ * For NOR boot, we must set this to the start of where NOR is mapped ++ * in memory. ++ */ ++#ifdef CONFIG_NOR_BOOT ++#define CONFIG_SYS_TEXT_BASE 0x08000000 ++#endif ++ ++/* ++ * USB configuration. We enable MUSB support, both for host and for ++ * gadget. We set USB0 as peripheral and USB1 as host, based on the ++ * board schematic and physical port wired to each. Then for host we ++ * add mass storage support and for gadget we add both RNDIS ethernet ++ * and DFU. ++ */ ++#define CONFIG_USB_MUSB_DSPS ++#define CONFIG_ARCH_MISC_INIT ++#define CONFIG_MUSB_GADGET ++#define CONFIG_MUSB_PIO_ONLY ++#define CONFIG_MUSB_DISABLE_BULK_COMBINE_SPLIT ++#define CONFIG_USB_GADGET ++#define CONFIG_USBDOWNLOAD_GADGET ++#define CONFIG_USB_GADGET_DUALSPEED ++#define CONFIG_USB_GADGET_VBUS_DRAW 2 ++#define CONFIG_MUSB_HOST ++#define CONFIG_AM335X_USB0 ++#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL ++#define CONFIG_AM335X_USB1 ++#define CONFIG_AM335X_USB1_MODE MUSB_HOST ++ ++#ifdef CONFIG_MUSB_HOST ++#define CONFIG_CMD_USB ++#define CONFIG_USB_STORAGE ++#endif ++ ++#ifdef CONFIG_MUSB_GADGET ++#define CONFIG_USB_ETHER ++#define CONFIG_USB_ETH_RNDIS ++#define CONFIG_USBNET_HOST_ADDR "de:ad:be:af:00:00" ++ ++/* USB TI's IDs */ ++#define CONFIG_G_DNL_VENDOR_NUM 0x0403 ++#define CONFIG_G_DNL_PRODUCT_NUM 0xBD00 ++#define CONFIG_G_DNL_MANUFACTURER "Texas Instruments" ++#endif /* CONFIG_MUSB_GADGET */ ++ ++#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) ++/* disable host part of MUSB in SPL */ ++#undef CONFIG_MUSB_HOST ++/* disable EFI partitions and partition UUID support */ ++#undef CONFIG_PARTITION_UUIDS ++#undef CONFIG_EFI_PARTITION ++/* ++ * Disable CPSW SPL support so we fit within the 101KiB limit. ++ */ ++#undef CONFIG_SPL_ETH_SUPPORT ++#endif ++ ++/* USB Device Firmware Update support */ ++#ifndef CONFIG_SPL_BUILD ++#define CONFIG_DFU_FUNCTION ++#define CONFIG_DFU_MMC ++#define CONFIG_CMD_DFU ++#define DFU_ALT_INFO_MMC \ ++ "dfu_alt_info_mmc=" \ ++ "boot part 0 1;" \ ++ "rootfs part 0 2;" \ ++ "MLO fat 0 1;" \ ++ "MLO.raw mmc 0x100 0x100;" \ ++ "u-boot.img.raw mmc 0x300 0x400;" \ ++ "spl-os-args.raw mmc 0x80 0x80;" \ ++ "spl-os-image.raw mmc 0x900 0x2000;" \ ++ "spl-os-args fat 0 1;" \ ++ "spl-os-image fat 0 1;" \ ++ "u-boot.img fat 0 1;" \ ++ "uEnv.txt fat 0 1\0" ++#ifdef CONFIG_NAND ++#define CONFIG_DFU_NAND ++#define DFU_ALT_INFO_NAND \ ++ "dfu_alt_info_nand=" \ ++ "SPL part 0 1;" \ ++ "SPL.backup1 part 0 2;" \ ++ "SPL.backup2 part 0 3;" \ ++ "SPL.backup3 part 0 4;" \ ++ "u-boot part 0 5;" \ ++ "u-boot-spl-os part 0 6;" \ ++ "kernel part 0 8;" \ ++ "rootfs part 0 9\0" ++#else ++#define DFU_ALT_INFO_NAND "" ++#endif ++#define CONFIG_DFU_RAM ++#define DFU_ALT_INFO_RAM \ ++ "dfu_alt_info_ram=" \ ++ "kernel ram 0x80200000 0xD80000;" \ ++ "fdt ram 0x80F80000 0x80000;" \ ++ "ramdisk ram 0x81000000 0x4000000\0" ++#define DFUARGS \ ++ "dfu_alt_info_emmc=rawemmc mmc 0 3751936\0" \ ++ DFU_ALT_INFO_MMC \ ++ DFU_ALT_INFO_RAM \ ++ DFU_ALT_INFO_NAND ++#endif ++ ++/* ++ * Default to using SPI for environment, etc. ++ * 0x000000 - 0x020000 : SPL (128KiB) ++ * 0x020000 - 0x0A0000 : U-Boot (512KiB) ++ * 0x0A0000 - 0x0BFFFF : First copy of U-Boot Environment (128KiB) ++ * 0x0C0000 - 0x0DFFFF : Second copy of U-Boot Environment (128KiB) ++ * 0x0E0000 - 0x442000 : Linux Kernel ++ * 0x442000 - 0x800000 : Userland ++ */ ++#if defined(CONFIG_SPI_BOOT) ++/* SPL related */ ++#undef CONFIG_SPL_OS_BOOT /* Not supported by existing map */ ++#define CONFIG_SPL_SPI_SUPPORT ++#define CONFIG_SPL_SPI_FLASH_SUPPORT ++#define CONFIG_SPL_SPI_LOAD ++#define CONFIG_SPL_SPI_BUS 0 ++#define CONFIG_SPL_SPI_CS 0 ++#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 ++ ++#define CONFIG_ENV_IS_IN_SPI_FLASH ++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT ++#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED ++#define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */ ++#define CONFIG_ENV_OFFSET (768 << 10) /* 768 KiB in */ ++#define CONFIG_ENV_OFFSET_REDUND (896 << 10) /* 896 KiB in */ ++#define MTDIDS_DEFAULT "nor0=m25p80-flash.0" ++#define MTDPARTS_DEFAULT "mtdparts=m25p80-flash.0:128k(SPL)," \ ++ "512k(u-boot),128k(u-boot-env1)," \ ++ "128k(u-boot-env2),3464k(kernel)," \ ++ "-(rootfs)" ++#elif defined(CONFIG_EMMC_BOOT) ++#undef CONFIG_ENV_IS_NOWHERE ++#define CONFIG_ENV_IS_IN_MMC ++#define CONFIG_SYS_MMC_ENV_DEV 1 ++#define CONFIG_SYS_MMC_ENV_PART 2 ++#define CONFIG_ENV_OFFSET 0x0 ++#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) ++#define CONFIG_SYS_REDUNDAND_ENVIRONMENT ++#endif ++ ++/* SPI flash. */ ++#define CONFIG_CMD_SF ++#define CONFIG_SPI_FLASH ++#define CONFIG_SPI_FLASH_WINBOND ++#define CONFIG_SF_DEFAULT_SPEED 24000000 ++ ++/* Network. */ ++#define CONFIG_PHY_GIGE ++#define CONFIG_PHYLIB ++#define CONFIG_PHY_SMSC ++ ++/* NAND support */ ++#ifdef CONFIG_NAND ++#define CONFIG_CMD_NAND ++#if !defined(CONFIG_SPI_BOOT) && !defined(CONFIG_NOR_BOOT) ++#define MTDIDS_DEFAULT "nand0=omap2-nand.0" ++ ++#ifndef CONFIG_NAND512MB ++#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:128k(SPL)," \ ++ "128k(SPL.backup1)," \ ++ "128k(SPL.backup2)," \ ++ "128k(SPL.backup3),1792k(u-boot)," \ ++ "128k(u-boot-spl-os)," \ ++ "128k(u-boot-env),5m(kernel),-(rootfs)" ++#define CONFIG_ENV_IS_IN_NAND ++#define CONFIG_ENV_OFFSET 0x260000 /* environment starts here */ ++#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ ++#else ++#define MTDPARTS_DEFAULT "mtdparts=omap2-nand.0:256k(SPL)," \ ++ "256k(SPL.backup1)," \ ++ "256k(SPL.backup2)," \ ++ "256k(SPL.backup3),2048k(u-boot)," \ ++ "256k(u-boot-spl-os)," \ ++ "256k(u-boot-env),5m(kernel),-(rootfs)" ++#define CONFIG_ENV_IS_IN_NAND ++#define CONFIG_ENV_OFFSET 0x340000 /* environment starts here */ ++#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ ++#endif ++ ++#endif ++#endif ++ ++/* ++ * NOR Size = 16 MiB ++ * Number of Sectors/Blocks = 128 ++ * Sector Size = 128 KiB ++ * Word length = 16 bits ++ * Default layout: ++ * 0x000000 - 0x07FFFF : U-Boot (512 KiB) ++ * 0x080000 - 0x09FFFF : First copy of U-Boot Environment (128 KiB) ++ * 0x0A0000 - 0x0BFFFF : Second copy of U-Boot Environment (128 KiB) ++ * 0x0C0000 - 0x4BFFFF : Linux Kernel (4 MiB) ++ * 0x4C0000 - 0xFFFFFF : Userland (11 MiB + 256 KiB) ++ */ ++#if defined(CONFIG_NOR) ++#undef CONFIG_SYS_NO_FLASH ++#define CONFIG_CMD_FLASH ++#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE ++#define CONFIG_SYS_FLASH_PROTECTION ++#define CONFIG_SYS_FLASH_CFI ++#define CONFIG_FLASH_CFI_DRIVER ++#define CONFIG_FLASH_CFI_MTD ++#define CONFIG_SYS_MAX_FLASH_SECT 128 ++#define CONFIG_SYS_MAX_FLASH_BANKS 1 ++#define CONFIG_SYS_FLASH_BASE (0x08000000) ++#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT ++#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE ++/* Reduce SPL size by removing unlikey targets */ ++#ifdef CONFIG_NOR_BOOT ++#define CONFIG_ENV_IS_IN_FLASH ++#define CONFIG_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ ++#define CONFIG_ENV_OFFSET (512 << 10) /* 512 KiB */ ++#define CONFIG_ENV_OFFSET_REDUND (768 << 10) /* 768 KiB */ ++#define MTDIDS_DEFAULT "nor0=physmap-flash.0" ++#define MTDPARTS_DEFAULT "mtdparts=physmap-flash.0:" \ ++ "512k(u-boot)," \ ++ "128k(u-boot-env1)," \ ++ "128k(u-boot-env2)," \ ++ "4m(kernel),-(rootfs)" ++#endif ++#endif /* NOR support */ ++ ++#endif /* ! __CONFIG_CHILISOM_H */ +-- +2.5.0 + diff --git a/unmaintained/uboot-chiliboard/0006-parabola-arm-modifications.patch b/unmaintained/uboot-chiliboard/0006-parabola-arm-modifications.patch new file mode 100644 index 000000000..81d52444e --- /dev/null +++ b/unmaintained/uboot-chiliboard/0006-parabola-arm-modifications.patch @@ -0,0 +1,177 @@ +diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h +index eacc9af..137ce89 100644 +--- a/include/configs/chiliboard.h ++++ b/include/configs/chiliboard.h +@@ -124,7 +124,6 @@ + * as that will normally be within the kernel lowmem and thus visible via + * bootm_size and we only run on platforms with 256MB or more of memory. + */ +-#ifdef CONFIG_RAM128MB + #define DEFAULT_LINUX_BOOT_ENV \ + "loadaddr=0x82000000\0" \ + "kernel_addr_r=0x82000000\0" \ +@@ -133,16 +132,6 @@ + "rdaddr=0x84080000\0" \ + "ramdisk_addr_r=0x84080000\0" \ + "bootm_size=0x8000000\0" +-#else +-#define DEFAULT_LINUX_BOOT_ENV \ +- "loadaddr=0x82000000\0" \ +- "kernel_addr_r=0x82000000\0" \ +- "fdtaddr=0x88000000\0" \ +- "fdt_addr_r=0x88000000\0" \ +- "rdaddr=0x88080000\0" \ +- "ramdisk_addr_r=0x88080000\0" \ +- "bootm_size=0x10000000\0" +-#endif + + /* + * Default to a quick boot delay. +@@ -258,6 +247,7 @@ + #define CONFIG_CMD_ASKENV + #define CONFIG_CMD_ECHO + #define CONFIG_CMD_BOOTZ ++#define CONFIG_SUPPORT_RAW_INITRD + + /* + * Common filesystems support. When we have removable storage we +@@ -398,6 +388,9 @@ + #define CONFIG_EFI_PARTITION + #define CONFIG_PARTITION_UUIDS + #define CONFIG_CMD_PART ++#define CONFIG_CMD_SETEXPR ++ ++#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre" + + #ifdef CONFIG_NAND + #ifndef CONFIG_NAND512MB +@@ -441,18 +434,16 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV \ + "boot_fdt=try\0" \ +- "bootpart=0:2\0" \ ++ "bootpart=0:1\0" \ + "bootdir=/boot\0" \ +- "bootfile=zImage\0" \ +- "fdtfile=undefined\0" \ ++ "fdtdir=/boot/dtbs/linux-libre\0" \ ++ "bootfile=vmlinuz-linux-libre\0" \ ++ "fdtfile=\0" \ + "console=ttyO0,115200n8\0" \ + "partitions=" \ + "uuid_disk=${uuid_gpt_disk};" \ + "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ + "optargs=\0" \ +- "mmcdev=0\0" \ +- "mmcroot=/dev/mmcblk0p2 rw\0" \ +- "mmcrootfstype=ext4 rootwait\0" \ + "rootpath=/export/rootfs\0" \ + "nfsopts=nolock\0" \ + "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ +@@ -461,8 +452,7 @@ + "ramrootfstype=ext2\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "${optargs} " \ +- "root=${mmcroot} " \ +- "rootfstype=${mmcrootfstype}\0" \ ++ "root=${root}\0" \ + "spiroot=/dev/mtdblock4 rw\0" \ + "spirootfstype=jffs2\0" \ + "spisrcaddr=0xe0000\0" \ +@@ -477,46 +467,47 @@ + "root=/dev/nfs " \ + "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ + "ip=dhcp\0" \ +- "bootenv=uEnv.txt\0" \ +- "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ +- "importbootenv=echo Importing environment from mmc ...; " \ +- "env import -t $loadaddr $filesize\0" \ + "ramargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=${ramroot} " \ + "rootfstype=${ramrootfstype}\0" \ +- "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ +- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ +- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ +- "mmcloados=run mmcargs; " \ +- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if run loadfdt; then " \ +- "bootz ${loadaddr} - ${fdtaddr}; " \ +- "else " \ +- "if test ${boot_fdt} = try; then " \ +- "bootz; " \ +- "else " \ +- "echo WARN: Cannot load the DT; " \ +- "fi; " \ +- "fi; " \ +- "else " \ +- "bootz; " \ +- "fi;\0" \ +- "mmcboot=mmc dev ${mmcdev}; " \ +- "if mmc rescan; then " \ +- "echo SD/MMC found on device ${mmcdev};" \ +- "if run loadbootenv; then " \ +- "echo Loaded environment from ${bootenv};" \ +- "run importbootenv;" \ +- "fi;" \ +- "if test -n $uenvcmd; then " \ +- "echo Running uenvcmd ...;" \ +- "run uenvcmd;" \ +- "fi;" \ +- "if run loadimage; then " \ +- "run mmcloados;" \ +- "fi;" \ +- "fi;\0" \ ++ "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ ++ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \ ++ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ ++ "mmcboot=for devtype in mmc; do " \ ++ "for devnum in 0 1; do " \ ++ "if ${devtype} dev ${devnum}; then " \ ++ "echo ${devtype} found on device ${devnum};" \ ++ "setenv bootpart ${devnum}:1;" \ ++ "part uuid ${devtype} ${bootpart} uuid;" \ ++ "setenv root PARTUUID=${uuid} rw rootwait;" \ ++ "echo Checking for: ${bootdir}/uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} ${bootdir}/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from ${bootdir}/uEnv.txt;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi;" \ ++ "if run loadimage; then " \ ++ "run mmcargs;" \ ++ "if run loadfdt; then " \ ++ "if run loadrd; then " \ ++ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ ++ "else " \ ++ "bootz ${loadaddr} - ${fdtaddr};" \ ++ "fi;" \ ++ "fi;" \ ++ "else " \ ++ "echo No kernel found;" \ ++ "fi;" \ ++ "setexpr devnum ${devnum} + 1;" \ ++ "fi;" \ ++ "done;" \ ++ "done;\0" \ + "spiboot=echo Booting from spi ...; " \ + "run spiargs; " \ + "sf probe ${spibusno}:0; " \ +@@ -541,9 +532,6 @@ + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ + "run mmcboot;" \ +- "setenv mmcdev 1; " \ +- "setenv bootpart 1:2; " \ +- "run mmcboot;" \ + "run nandboot;" + + /* NS16550 Configuration */ +-- +2.5.0 + diff --git a/unmaintained/uboot-chiliboard/0006-parabola-arm-modifications.patch.new b/unmaintained/uboot-chiliboard/0006-parabola-arm-modifications.patch.new new file mode 100644 index 000000000..391fc504a --- /dev/null +++ b/unmaintained/uboot-chiliboard/0006-parabola-arm-modifications.patch.new @@ -0,0 +1,174 @@ +diff --git a/u-boot-2014.07.orig/include/configs/chiliboard.h b/u-boot-2014.07/include/configs/chiliboard.h +index eacc9af..137ce89 100644 +--- a/u-boot-2014.07.orig/include/configs/chiliboard.h ++++ b/u-boot-2014.07/include/configs/chiliboard.h +@@ -124,7 +124,6 @@ + * as that will normally be within the kernel lowmem and thus visible via + * bootm_size and we only run on platforms with 256MB or more of memory. + */ +-#ifdef CONFIG_RAM128MB + #define DEFAULT_LINUX_BOOT_ENV \ + "loadaddr=0x82000000\0" \ + "kernel_addr_r=0x82000000\0" \ +@@ -133,16 +132,6 @@ + "rdaddr=0x84080000\0" \ + "ramdisk_addr_r=0x84080000\0" \ + "bootm_size=0x8000000\0" +-#else +-#define DEFAULT_LINUX_BOOT_ENV \ +- "loadaddr=0x82000000\0" \ +- "kernel_addr_r=0x82000000\0" \ +- "fdtaddr=0x88000000\0" \ +- "fdt_addr_r=0x88000000\0" \ +- "rdaddr=0x88080000\0" \ +- "ramdisk_addr_r=0x88080000\0" \ +- "bootm_size=0x10000000\0" +-#endif + + /* + * Default to a quick boot delay. +@@ -258,6 +247,7 @@ + #define CONFIG_CMD_ASKENV + #define CONFIG_CMD_ECHO + #define CONFIG_CMD_BOOTZ ++#define CONFIG_SUPPORT_RAW_INITRD + + /* + * Common filesystems support. When we have removable storage we +@@ -398,6 +388,9 @@ + #define CONFIG_EFI_PARTITION + #define CONFIG_PARTITION_UUIDS + #define CONFIG_CMD_PART ++#define CONFIG_CMD_SETEXPR ++ ++#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre" + + #ifdef CONFIG_NAND + #ifndef CONFIG_NAND512MB +@@ -441,18 +434,16 @@ + #define CONFIG_EXTRA_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV \ + "boot_fdt=try\0" \ +- "bootpart=0:2\0" \ ++ "bootpart=0:1\0" \ + "bootdir=/boot\0" \ +- "bootfile=zImage\0" \ +- "fdtfile=undefined\0" \ ++ "fdtdir=/boot/dtbs/linux-libre\0" \ ++ "bootfile=vmlinuz-linux-libre\0" \ ++ "fdtfile=\0" \ + "console=ttyO0,115200n8\0" \ + "partitions=" \ + "uuid_disk=${uuid_gpt_disk};" \ + "name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \ + "optargs=\0" \ +- "mmcdev=0\0" \ +- "mmcroot=/dev/mmcblk0p2 rw\0" \ +- "mmcrootfstype=ext4 rootwait\0" \ + "rootpath=/export/rootfs\0" \ + "nfsopts=nolock\0" \ + "static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \ +@@ -461,8 +452,7 @@ + "ramrootfstype=ext2\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "${optargs} " \ +- "root=${mmcroot} " \ +- "rootfstype=${mmcrootfstype}\0" \ ++ "root=${root}\0" \ + "spiroot=/dev/mtdblock4 rw\0" \ + "spirootfstype=jffs2\0" \ + "spisrcaddr=0xe0000\0" \ +@@ -477,46 +467,47 @@ + "root=/dev/nfs " \ + "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ + "ip=dhcp\0" \ +- "bootenv=uEnv.txt\0" \ +- "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ +- "importbootenv=echo Importing environment from mmc ...; " \ +- "env import -t $loadaddr $filesize\0" \ + "ramargs=setenv bootargs console=${console} " \ + "${optargs} " \ + "root=${ramroot} " \ + "rootfstype=${ramrootfstype}\0" \ +- "loadramdisk=load mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \ +- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ +- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ +- "mmcloados=run mmcargs; " \ +- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if run loadfdt; then " \ +- "bootz ${loadaddr} - ${fdtaddr}; " \ +- "else " \ +- "if test ${boot_fdt} = try; then " \ +- "bootz; " \ +- "else " \ +- "echo WARN: Cannot load the DT; " \ +- "fi; " \ +- "fi; " \ +- "else " \ +- "bootz; " \ +- "fi;\0" \ +- "mmcboot=mmc dev ${mmcdev}; " \ +- "if mmc rescan; then " \ +- "echo SD/MMC found on device ${mmcdev};" \ +- "if run loadbootenv; then " \ +- "echo Loaded environment from ${bootenv};" \ +- "run importbootenv;" \ +- "fi;" \ +- "if test -n $uenvcmd; then " \ +- "echo Running uenvcmd ...;" \ +- "run uenvcmd;" \ +- "fi;" \ +- "if run loadimage; then " \ +- "run mmcloados;" \ +- "fi;" \ +- "fi;\0" \ ++ "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ ++ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \ ++ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ ++ "mmcboot=for devtype in mmc; do " \ ++ "for devnum in 0 1; do " \ ++ "if ${devtype} dev ${devnum}; then " \ ++ "echo ${devtype} found on device ${devnum};" \ ++ "setenv bootpart ${devnum}:1;" \ ++ "part uuid ${devtype} ${bootpart} uuid;" \ ++ "setenv root PARTUUID=${uuid} rw rootwait;" \ ++ "echo Checking for: ${bootdir}/uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} ${bootdir}/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from ${bootdir}/uEnv.txt;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi;" \ ++ "if run loadimage; then " \ ++ "run mmcargs;" \ ++ "if run loadfdt; then " \ ++ "if run loadrd; then " \ ++ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ ++ "else " \ ++ "bootz ${loadaddr} - ${fdtaddr};" \ ++ "fi;" \ ++ "fi;" \ ++ "else " \ ++ "echo No kernel found;" \ ++ "fi;" \ ++ "setexpr devnum ${devnum} + 1;" \ ++ "fi;" \ ++ "done;" \ ++ "done;\0" \ + "spiboot=echo Booting from spi ...; " \ + "run spiargs; " \ + "sf probe ${spibusno}:0; " \ +@@ -541,9 +532,6 @@ + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ + "run mmcboot;" \ +- "setenv mmcdev 1; " \ +- "setenv bootpart 1:2; " \ +- "run mmcboot;" \ + "run nandboot;" + + /* NS16550 Configuration */ diff --git a/unmaintained/uboot-chiliboard/PKGBUILD b/unmaintained/uboot-chiliboard/PKGBUILD new file mode 100644 index 000000000..2f7dfdc47 --- /dev/null +++ b/unmaintained/uboot-chiliboard/PKGBUILD @@ -0,0 +1,59 @@ +# U-Boot: ChiliBoard +# Maintainer: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgname=uboot-chiliboard +pkgver=2014.07 +pkgrel=1.parabola1 +pkgdesc="U-Boot for ChiliBoard" +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +replaces=('uboot-chiliboard-linux-libre') +conflicts=('uboot4extlinux-chiliboard' 'uboot4grub-chiliboard') +makedepends=('bc') +depends=('linux-libre') +license=('GPL') +install=${pkgname}.install +source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" + '0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch' + '0002-ARM-asm-io.h-use-static-inline.patch' + '0003-common-main.c-make-show_boot_progress-__weak.patch' + '0004-common-board_f-cosmetic-use-__weak-for-leds.patch' + '0005-chiliboard-support.patch' + '0006-parabola-arm-modifications.patch' + 'uEnv.txt') +md5sums=('36d4bad687edcafa396fee607e505d4e' + 'e070e8b5cf8628b6440dfc9dbd87cb65' + '318310de19110167fe15ceac3ae32f7d' + '1792346431786e1442c4059cd3f288ed' + '2a32a77f123391c02935754ced2743c2' + '5951c799b35c526f02edbcb3eb1295fc' + '1bc6fd3299a42e15c5f14741aac15052' + '0afad1f6f3f8609db6e1f5bb322b2a1a') + +prepare() { + cd u-boot-${pkgver} + patch -Np1 -i ../0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch + patch -Np1 -i ../0002-ARM-asm-io.h-use-static-inline.patch + patch -Np1 -i ../0003-common-main.c-make-show_boot_progress-__weak.patch + patch -Np1 -i ../0004-common-board_f-cosmetic-use-__weak-for-leds.patch + patch -Np1 -i ../0005-chiliboard-support.patch + patch -Np1 -i ../0006-parabola-arm-modifications.patch +} + +build() { + cd u-boot-${pkgver} + + unset CFLAGS CXXFLAGS LDFLAGS + + make distclean + make chiliboard_config + make +} + +package() { + cd u-boot-${pkgver} + mkdir -p "${pkgdir}"/boot + cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot +} diff --git a/unmaintained/uboot-chiliboard/uEnv.txt b/unmaintained/uboot-chiliboard/uEnv.txt new file mode 100644 index 000000000..a9f26096d --- /dev/null +++ b/unmaintained/uboot-chiliboard/uEnv.txt @@ -0,0 +1 @@ +optargs= diff --git a/unmaintained/uboot-chiliboard/uboot-chiliboard.install b/unmaintained/uboot-chiliboard/uboot-chiliboard.install new file mode 100644 index 000000000..24ccc1acb --- /dev/null +++ b/unmaintained/uboot-chiliboard/uboot-chiliboard.install @@ -0,0 +1,32 @@ +flash_instructions() { + echo "# dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k" + echo "# dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k" +} + +flash_uboot() { + root=$(mount | awk '/ on \/ / { print $1; }') + if [[ $root =~ ^/dev/mmcblk.*$ ]]; then + root=${root:0:12} + echo "A new U-Boot version needs to be flashed onto $root." + echo "Do this now? [y|N]" + read -r shouldwe + if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then + dd if=/boot/MLO of=$root count=1 seek=1 conv=notrunc bs=128k + dd if=/boot/u-boot.img of=$root count=2 seek=1 conv=notrunc bs=384k + else + echo "You can do this later by running:" + flash_instructions + fi + else + echo "Flash the new U-Boot version onto your boot device. For example:" + flash_instructions + fi +} + +post_install() { + flash_uboot +} + +post_upgrade() { + flash_uboot +} diff --git a/unmaintained/uboot-cubox/PKGBUILD b/unmaintained/uboot-cubox/PKGBUILD new file mode 100644 index 000000000..a27e33472 --- /dev/null +++ b/unmaintained/uboot-cubox/PKGBUILD @@ -0,0 +1,26 @@ +# U-Boot: CuBox (Dove) +# Maintainer: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgname=uboot-cubox +pkgver=2009.08 +pkgrel=1.parabola1 +pkgdesc="U-Boot for CuBox (Dove)" +arch=('armv7h') +url="https://projects.parabola.nu/abslibre.git/" +license=('GPL') +makedepends=('uboot-tools') +depends=('linux-libre') +replaces=('uboot-cubox-linux-libre') +conflicts=('uboot4extlinux-cubox' 'uboot4grub-cubox') +backup=('boot/boot.scr') +_commit=814386d3e43b8ab8d81f04aa7fe402952503d8fe +source=('boot.txt') +md5sums=('02356c39d1e254e3f64c016be3895191') + +package() { + mkimage -A arm -O linux -T script -C none -n "Boot script" -d boot.txt boot.scr + mkdir -p "${pkgdir}"/boot + cp boot.scr "${pkgdir}"/boot +} diff --git a/unmaintained/uboot-cubox/boot.txt b/unmaintained/uboot-cubox/boot.txt new file mode 100644 index 000000000..348639632 --- /dev/null +++ b/unmaintained/uboot-cubox/boot.txt @@ -0,0 +1,12 @@ +echo ======== Starting boot ======== +usb start +setenv uimagearg 'uImage' +setenv uinitarg 'uInitrd' +setenv my1arg 'console=ttyS0,115200n8 console=tty1,115200n8' +setenv my2arg 'vmalloc=384M video=dovefb:lcd0:1280x720-32@60-edid clcd.lcd0_enable=1 clcd.lcd1_enable=0' +ext2load ide 0:1 0x04000000 /boot/${uinitarg} && ext2load ide 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000 0x04000000 +ext2load usb 0:1 0x04000000 /boot/${uinitarg} && ext2load usb 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000 0x04000000 +ext2load mmc 0:1 0x04000000 /boot/${uinitarg} && ext2load mmc 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/mmcblk0p1 rw rootwait' && bootm 0x02000000 0x04000000 +ext2load ide 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000 +ext2load usb 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/sda1 rw rootwait' && bootm 0x02000000 +ext2load mmc 0:1 0x02000000 /boot/${uimagearg} && setenv bootargs ${my1arg} ${my2arg} 'root=/dev/mmcblk0p1 rw rootwait' && bootm 0x02000000 diff --git a/unmaintained/uboot-mx6_cubox-i/PKGBUILD b/unmaintained/uboot-mx6_cubox-i/PKGBUILD new file mode 100644 index 000000000..28fe8d518 --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/PKGBUILD @@ -0,0 +1,69 @@ +# Maintainer: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgbase=uboot-mx6_cubox-i +pkgname=('uboot-mx6_cubox-i') +pkgver=2013.10 +pkgrel=1 +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +license=('GPL') +depends=('linux-libre') +replaces=('uboot-cubox-i' 'uboot-cubox-i-linux-libre') +conflicts=('uboot4extlinux-mx6_cubox-i' 'uboot4grub-mx6_cubox-i') +option=('!strip') +_commit=408544d61f230060f18ffe2e06565deadbcf3451 +source=("uboot-${_commit}.tar.gz::https://github.com/SolidRun/u-boot-imx6/archive/${_commit}.tar.gz" + 'kernel-add-support-for-gcc-5.patch' + 'arm_board_use_weak.patch' + 'leds_missing_include.patch' + 'remove_unnecessary_inits.patch' + 'u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch' + 'no-unalligned-access.patch' + 'common-main.c-make-show_boot_progress-__weak.patch' + 'parabola-modifications.patch') +md5sums=('8dc15f4cf0b244a8d9598a2ce93056a4' + '721a46867e189d8dedc6b6f86a536a34' + 'b8cd082b76224d157d55404d0bc87831' + 'cf823fe2da67b8db5b9de9352a815f91' + '6f3d537701904f0244e6d857e2545c5d' + '8ed91e4257bfb7e0971fa988342537a3' + '629d34349b5652e2d4274ad89e1c4481' + '8087672256020417438b12ec4946e1cf' + '19178e6d85b6b8278fa70eee5db18f83') +prepare() { + cd u-boot-imx6-${_commit} + + patch -Np1 -i ../kernel-add-support-for-gcc-5.patch + patch -Np1 -i ../arm_board_use_weak.patch + patch -Np1 -i ../leds_missing_include.patch + patch -Np1 -i ../remove_unnecessary_inits.patch + patch -Np1 -i ../u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch + patch -Np1 -i ../no-unalligned-access.patch + patch -Np1 -i ../common-main.c-make-show_boot_progress-__weak.patch + patch -Np1 -i ../parabola-modifications.patch +} + +build() { + cd u-boot-imx6-${_commit} + + unset CFLAGS + unset CXXFLAGS + unset LDFLAGS + + make distclean + make mx6_cubox-i_config + make +} + +package() { + pkgdesc="U-Boot for all CuBox-i variants" + install=${pkgbase}.install + + cd u-boot-imx6-${_commit} + + mkdir -p "${pkgdir}"/boot + cp u-boot.img "${pkgdir}"/boot + cp SPL "${pkgdir}"/boot +} diff --git a/unmaintained/uboot-mx6_cubox-i/arm_board_use_weak.patch b/unmaintained/uboot-mx6_cubox-i/arm_board_use_weak.patch new file mode 100644 index 000000000..58ab1d045 --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/arm_board_use_weak.patch @@ -0,0 +1,81 @@ +From 8590c800ee60e46f15d6085e3c1fed0d6881fc62 Mon Sep 17 00:00:00 2001 +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Wed, 8 Oct 2014 22:57:21 +0200 +Subject: [PATCH] arm: board: use __weak + +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +Acked-by: Albert ARIBAUD <albert.u.boot@aribaud.net> +--- + arch/arm/lib/board.c | 40 ++++++++++++---------------------------- + 1 file changed, 12 insertions(+), 28 deletions(-) + +diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c +index 76adaf3..98782ca 100644 +--- a/arch/arm/lib/board.c ++++ b/arch/arm/lib/board.c +@@ -63,25 +63,15 @@ extern void dataflash_print_info(void); + ************************************************************************ + * May be supplied by boards if desired + */ +-inline void __coloured_LED_init(void) {} +-void coloured_LED_init(void) +- __attribute__((weak, alias("__coloured_LED_init"))); +-inline void __red_led_on(void) {} +-void red_led_on(void) __attribute__((weak, alias("__red_led_on"))); +-inline void __red_led_off(void) {} +-void red_led_off(void) __attribute__((weak, alias("__red_led_off"))); +-inline void __green_led_on(void) {} +-void green_led_on(void) __attribute__((weak, alias("__green_led_on"))); +-inline void __green_led_off(void) {} +-void green_led_off(void) __attribute__((weak, alias("__green_led_off"))); +-inline void __yellow_led_on(void) {} +-void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on"))); +-inline void __yellow_led_off(void) {} +-void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off"))); +-inline void __blue_led_on(void) {} +-void blue_led_on(void) __attribute__((weak, alias("__blue_led_on"))); +-inline void __blue_led_off(void) {} +-void blue_led_off(void) __attribute__((weak, alias("__blue_led_off"))); ++__weak void coloured_LED_init(void) {} ++__weak void red_led_on(void) {} ++__weak void red_led_off(void) {} ++__weak void green_led_on(void) {} ++__weak void green_led_off(void) {} ++__weak void yellow_led_on(void) {} ++__weak void yellow_led_off(void) {} ++__weak void blue_led_on(void) {} ++__weak void blue_led_off(void) {} + + /* + ************************************************************************ +@@ -198,27 +188,21 @@ static int arm_pci_init(void) + */ + typedef int (init_fnc_t) (void); + +-void __dram_init_banksize(void) ++__weak void dram_init_banksize(void) + { + gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; + gd->bd->bi_dram[0].size = gd->ram_size; + } +-void dram_init_banksize(void) +- __attribute__((weak, alias("__dram_init_banksize"))); + +-int __arch_cpu_init(void) ++__weak int arch_cpu_init(void) + { + return 0; + } +-int arch_cpu_init(void) +- __attribute__((weak, alias("__arch_cpu_init"))); + +-int __power_init_board(void) ++__weak int power_init_board(void) + { + return 0; + } +-int power_init_board(void) +- __attribute__((weak, alias("__power_init_board"))); + + /* Record the board_init_f() bootstage (after arch_cpu_init()) */ + static int mark_bootstage(void) diff --git a/unmaintained/uboot-mx6_cubox-i/cmd_test_implement_-e_for_file_existance.patch b/unmaintained/uboot-mx6_cubox-i/cmd_test_implement_-e_for_file_existance.patch new file mode 100644 index 000000000..02f2d9493 --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/cmd_test_implement_-e_for_file_existance.patch @@ -0,0 +1,53 @@ +This is much like a regular shell's -e operator, except that it takes +multiple arguments to specify the device type and device/partition ID +in addition to the usual filename: + +if test -e mmc 0:1 /boot/boot.scr; then echo yes; else echo no; fi + +Signed-off-by: Stephen Warren <swarren at nvidia.com> +--- +v3: New patch. +--- + common/cmd_test.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/common/cmd_test.c b/common/cmd_test.c +index 4c2f967c6dc0..c93fe7823100 100644 +--- a/common/cmd_test.c ++++ b/common/cmd_test.c +@@ -16,6 +16,7 @@ + + #include <common.h> + #include <command.h> ++#include <fs.h> + + #define OP_INVALID 0 + #define OP_NOT 1 +@@ -33,6 +34,7 @@ + #define OP_INT_LE 13 + #define OP_INT_GT 14 + #define OP_INT_GE 15 ++#define OP_FILE_EXISTS 16 + + const struct { + int arg; +@@ -55,6 +57,7 @@ const struct { + {0, "-a", OP_AND, 1}, + {0, "-z", OP_STR_EMPTY, 2}, + {0, "-n", OP_STR_NEMPTY, 2}, ++ {0, "-e", OP_FILE_EXISTS, 4}, + }; + + static int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) +@@ -143,6 +146,9 @@ static int do_test(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) + expr = simple_strtol(ap[0], NULL, 10) >= + simple_strtol(ap[2], NULL, 10); + break; ++ case OP_FILE_EXISTS: ++ expr = file_exists(ap[1], ap[2], ap[3], FS_TYPE_ANY); ++ break; + } + + switch (op) { +-- +1.8.1.5 diff --git a/unmaintained/uboot-mx6_cubox-i/common-main.c-make-show_boot_progress-__weak.patch b/unmaintained/uboot-mx6_cubox-i/common-main.c-make-show_boot_progress-__weak.patch new file mode 100644 index 000000000..41b9c5cb2 --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/common-main.c-make-show_boot_progress-__weak.patch @@ -0,0 +1,31 @@ +From 8158ac85f16963ff1d075255cd3f34b4f0614265 Mon Sep 17 00:00:00 2001 +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Thu, 26 Jun 2014 20:18:31 +0200 +Subject: [PATCH 4/6] common: main.c: make show_boot_progress __weak + +This not only looks a bit better it also prevents a +warning with W=1 (no previous prototype). + +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +Acked-by: Simon Glass <sjg@chromium.org> +--- + common/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/common/main.c b/common/main.c +index 32618f1..2979fbe 100644 +--- a/common/main.c ++++ b/common/main.c +@@ -17,8 +17,7 @@ DECLARE_GLOBAL_DATA_PTR; + /* + * Board-specific Platform code can reimplement show_boot_progress () if needed + */ +-void inline __show_boot_progress (int val) {} +-void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); ++__weak void show_boot_progress(int val) {} + + static void modem_init(void) + { +-- +2.4.4 + diff --git a/unmaintained/uboot-mx6_cubox-i/kernel-add-support-for-gcc-5.patch b/unmaintained/uboot-mx6_cubox-i/kernel-add-support-for-gcc-5.patch new file mode 100644 index 000000000..30718c561 --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/kernel-add-support-for-gcc-5.patch @@ -0,0 +1,97 @@ +From 5b07fc2c680ad4279a45d863108544020b4d74cd Mon Sep 17 00:00:00 2001 +From: Sasha Levin <sasha.levin@oracle.com> +Date: Mon, 13 Oct 2014 15:51:05 -0700 +Subject: [PATCH 2/6] kernel: add support for gcc 5 + +We're missing include/linux/compiler-gcc5.h which is required now +because gcc branched off to v5 in trunk. + +Just copy the relevant bits out of include/linux/compiler-gcc4.h, +no new code is added as of now. + +This fixes a build error when using gcc 5. + +Signed-off-by: Sasha Levin <sasha.levin@oracle.com> +Cc: <stable@vger.kernel.org> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +--- + include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + create mode 100644 include/linux/compiler-gcc5.h + +diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h +new file mode 100644 +index 0000000..cdd1cc2 +--- /dev/null ++++ b/include/linux/compiler-gcc5.h +@@ -0,0 +1,66 @@ ++#ifndef __LINUX_COMPILER_H ++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." ++#endif ++ ++#define __used __attribute__((__used__)) ++#define __must_check __attribute__((warn_unused_result)) ++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) ++ ++/* Mark functions as cold. gcc will assume any path leading to a call ++ to them will be unlikely. This means a lot of manual unlikely()s ++ are unnecessary now for any paths leading to the usual suspects ++ like BUG(), printk(), panic() etc. [but let's keep them for now for ++ older compilers] ++ ++ Early snapshots of gcc 4.3 don't support this and we can't detect this ++ in the preprocessor, but we can live with this because they're unreleased. ++ Maketime probing would be overkill here. ++ ++ gcc also has a __attribute__((__hot__)) to move hot functions into ++ a special section, but I don't see any sense in this right now in ++ the kernel context */ ++#define __cold __attribute__((__cold__)) ++ ++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) ++ ++#ifndef __CHECKER__ ++# define __compiletime_warning(message) __attribute__((warning(message))) ++# define __compiletime_error(message) __attribute__((error(message))) ++#endif /* __CHECKER__ */ ++ ++/* ++ * Mark a position in code as unreachable. This can be used to ++ * suppress control flow warnings after asm blocks that transfer ++ * control elsewhere. ++ * ++ * Early snapshots of gcc 4.5 don't support this and we can't detect ++ * this in the preprocessor, but we can live with this because they're ++ * unreleased. Really, we need to have autoconf for the kernel. ++ */ ++#define unreachable() __builtin_unreachable() ++ ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) ++ ++/* ++ * Tell the optimizer that something else uses this function or variable. ++ */ ++#define __visible __attribute__((externally_visible)) ++ ++/* ++ * GCC 'asm goto' miscompiles certain code sequences: ++ * ++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 ++ * ++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. ++ * Fixed in GCC 4.8.2 and later versions. ++ * ++ * (asm goto is automatically volatile - the naming reflects this.) ++ */ ++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) ++ ++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP ++#define __HAVE_BUILTIN_BSWAP32__ ++#define __HAVE_BUILTIN_BSWAP64__ ++#define __HAVE_BUILTIN_BSWAP16__ ++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ +-- +2.4.4 + diff --git a/unmaintained/uboot-mx6_cubox-i/leds_missing_include.patch b/unmaintained/uboot-mx6_cubox-i/leds_missing_include.patch new file mode 100644 index 000000000..9828d1e89 --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/leds_missing_include.patch @@ -0,0 +1,61 @@ +From 52422e37bb199fa5c62881cdf26c687aa692d063 Mon Sep 17 00:00:00 2001 +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Wed, 8 Oct 2014 22:57:53 +0200 +Subject: [PATCH] leds: missing include + +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +--- + arch/arm/cpu/arm926ejs/at91/led.c | 1 + + arch/arm/lib/board.c | 1 + + board/atmel/at91rm9200ek/led.c | 1 + + board/atmel/at91sam9260ek/led.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/arch/arm/cpu/arm926ejs/at91/led.c b/arch/arm/cpu/arm926ejs/at91/led.c +index 46ed055..b8d5c78 100644 +--- a/arch/arm/cpu/arm926ejs/at91/led.c ++++ b/arch/arm/cpu/arm926ejs/at91/led.c +@@ -9,6 +9,7 @@ + #include <common.h> + #include <asm/gpio.h> + #include <asm/arch/gpio.h> ++#include <status_led.h> + + #ifdef CONFIG_RED_LED + void red_led_on(void) +diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c +index 98782ca..f606255 100644 +--- a/arch/arm/lib/board.c ++++ b/arch/arm/lib/board.c +@@ -34,6 +34,7 @@ + #include <nand.h> + #include <onenand_uboot.h> + #include <mmc.h> ++#include <status_led.h> + #include <libfdt.h> + #include <fdtdec.h> + #include <post.h> +diff --git a/board/atmel/at91rm9200ek/led.c b/board/atmel/at91rm9200ek/led.c +index 2298e36..6761b14 100644 +--- a/board/atmel/at91rm9200ek/led.c ++++ b/board/atmel/at91rm9200ek/led.c +@@ -14,6 +14,7 @@ + #include <asm/arch/hardware.h> + #include <asm/arch/at91_pmc.h> + #include <asm/arch/at91_pio.h> ++#include <status_led.h> + + /* bit mask in PIO port B */ + #define GREEN_LED (1<<0) +diff --git a/board/atmel/at91sam9260ek/led.c b/board/atmel/at91sam9260ek/led.c +index 56d811c..fbe15af 100644 +--- a/board/atmel/at91sam9260ek/led.c ++++ b/board/atmel/at91sam9260ek/led.c +@@ -9,6 +9,7 @@ + #include <common.h> + #include <asm/io.h> + #include <asm/arch/gpio.h> ++#include <status_led.h> + + void coloured_LED_init(void) + { diff --git a/unmaintained/uboot-mx6_cubox-i/no-unalligned-access.patch b/unmaintained/uboot-mx6_cubox-i/no-unalligned-access.patch new file mode 100644 index 000000000..6582724e7 --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/no-unalligned-access.patch @@ -0,0 +1,22 @@ +diff --git a/arch/arm/cpu/armv7/config.mk b/arch/arm/cpu/armv7/config.mk +index d01f3d9..c048531 100644 +--- a/arch/arm/cpu/armv7/config.mk ++++ b/arch/arm/cpu/armv7/config.mk +@@ -10,9 +10,12 @@ + PF_CPPFLAGS_ARMV7 := $(call cc-option, -march=armv7-a, -march=armv5) + PLATFORM_CPPFLAGS += $(PF_CPPFLAGS_ARMV7) + +-# SEE README.arm-unaligned-accesses ++# On supported platforms we set the bit which causes us to trap on unaligned ++# memory access. This is the opposite of what the compiler expects to be ++# the default so we must pass in -mno-unaligned-access so that it is aware ++# of our decision. + PF_NO_UNALIGNED := $(call cc-option, -mno-unaligned-access,) +-PLATFORM_NO_UNALIGNED := $(PF_NO_UNALIGNED) ++PLATFORM_CPPFLAGS += $(PF_NO_UNALIGNED) + + ifneq ($(CONFIG_IMX_CONFIG),) + ifdef CONFIG_SPL +-- +1.7.9.5 + diff --git a/unmaintained/uboot-mx6_cubox-i/parabola-modifications.patch b/unmaintained/uboot-mx6_cubox-i/parabola-modifications.patch new file mode 100644 index 000000000..757622e82 --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/parabola-modifications.patch @@ -0,0 +1,90 @@ +diff -ruN a/include/configs/mx6_cubox-i.h b/include/configs/mx6_cubox-i.h +--- a/include/configs/mx6_cubox-i.h 2015-10-13 11:56:13.000000000 +0000 ++++ b/include/configs/mx6_cubox-i.h 2015-11-05 18:35:27.766174690 +0000 +@@ -97,6 +97,7 @@ + #define CONFIG_FS_EXT4 + #define CONFIG_FS_FAT + #define CONFIG_CMD_FS_GENERIC ++#define CONFIG_SUPPORT_RAW_INITRD + + /* Ethernet Configuration */ + #define CONFIG_FEC_MXC +@@ -176,11 +177,14 @@ + "bootfile=auto\0" \ + "bootenv=uEnv.txt\0" \ + "boot_prefixes=/ /boot/\0" \ ++ "fdtfile_prefix=dtbs/linux-libre/\0" \ + "console=ttymxc0\0" \ + "splashpos=m,m\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + "fdt_addr=0x18000000\0" \ ++ "ramdisk_file=initramfs-linux-libre.img\0" \ ++ "ramdisk_addr=0x15100000\0" \ + "boot_fdt=try\0" \ + "ip_dyn=yes\0" \ + "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ +@@ -220,7 +224,9 @@ + "fi;\0" \ + "loadbootenv=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${file_prefix}${bootenv};\0" \ + "loadfdt=if test ${boottype} = mmc; then " \ +- "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${file_prefix}${fdt_file}; " \ ++ "if load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${file_prefix}${fdt_file}; then; else " \ ++ "load mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${file_prefix}${fdtfile_prefix}${fdt_file}; " \ ++ "fi; " \ + "else " \ + "${get_cmd} ${fdt_addr} ${fdt_file}; " \ + "fi;\0 " \ +@@ -228,13 +234,14 @@ + "load mmc ${mmcdev}:${mmcpart} ${ramdisk_addr} ${file_prefix}${ramdisk_file}; " \ + "else " \ + "${get_cmd} ${ramdisk_addr} ${ramdisk_file}; " \ +- "fi;\0 " \ ++ "fi; " \ ++ "setenv ramdisk_size :${filesize}; \0" \ + "loadbootfile=load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${file_prefix}${bootfile};\0" \ + "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ + "env import -t ${loadaddr} ${filesize};\0" \ + "autoboot=echo Booting ${boot_file}; " \ +- "if test ${boot_file} = zImage; then " \ +- "bootz ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \ ++ "if test ${boot_file} = vmlinuz-linux-libre; then " \ ++ "bootz ${loadaddr} ${ramdisk_addr}${ramdisk_size} ${fdt_addr}; " \ + "else " \ + "bootm ${loadaddr} ${ramdisk_addr} ${fdt_addr}; " \ + "fi;\0 " \ +@@ -249,14 +256,14 @@ + "else " \ + "setenv ramdisk_addr -; " \ + "fi; " \ +- "if test ${boot_file} = zImage; then " \ ++ "if test ${boot_file} = vmlinuz-linux-libre; then " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ + "echo Loaded ${fdt_file}; " \ + "else " \ + "setenv fdt_addr; " \ + "if test ${boot_fdt} = try; then " \ +- "echo WARN: Cannot load the DTB and boot file is type zImage;" \ ++ "echo WARN: Cannot load the DTB and boot file is type vmlinuz-linux-libre;" \ + "echo if you have not appended a dtb to the file it may;" \ + "echo hang after displaying Starting kernel...;" \ + "echo ;" \ +@@ -287,7 +294,7 @@ + "setenv get_cmd tftp; " \ + "fi; " \ + "if test ${bootfile} = auto; then " \ +- "setenv bootfile zImage; " \ ++ "setenv bootfile vmlinuz-linux-libre; " \ + "if ${get_cmd} ${bootfile}; then " \ + "run bootit; " \ + "else " \ +@@ -313,7 +320,7 @@ + "fi; " \ + "if test ${bootfile} = auto; then " \ + "setenv origbootfile auto; " \ +- "setenv bootfile zImage; " \ ++ "setenv bootfile vmlinuz-linux-libre; " \ + "if run loadbootfile; then " \ + "run mmcboot; " \ + "else " \ diff --git a/unmaintained/uboot-mx6_cubox-i/remove_unnecessary_inits.patch b/unmaintained/uboot-mx6_cubox-i/remove_unnecessary_inits.patch new file mode 100644 index 000000000..8ab039177 --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/remove_unnecessary_inits.patch @@ -0,0 +1,818 @@ +From b60eff31f3bd71a6f14b6c6efc8ad5fb3705de6d Mon Sep 17 00:00:00 2001 +From: Albert ARIBAUD <albert.u.boot@aribaud.net> +Date: Sat, 22 Feb 2014 17:53:43 +0100 +Subject: [PATCH] arm: remove unneeded symbol offsets and _TEXT_BASE + +Remove the last uses of symbol offsets in ARM U-Boot. +Remove some needless uses of _TEXT_BASE. +Remove all _TEXT_BASE definitions. + +Signed-off-by: Albert ARIBAUD <albert.u.boot@aribaud.net> +--- + README | 6 ------ + arch/arm/cpu/arm1136/start.S | 27 --------------------------- + arch/arm/cpu/arm1176/start.S | 27 --------------------------- + arch/arm/cpu/arm720t/start.S | 26 -------------------------- + arch/arm/cpu/arm920t/start.S | 26 -------------------------- + arch/arm/cpu/arm926ejs/at91/lowlevel_init.S | 14 +------------- + arch/arm/cpu/arm926ejs/mxs/start.S | 27 --------------------------- + arch/arm/cpu/arm926ejs/start.S | 27 --------------------------- + arch/arm/cpu/arm946es/start.S | 26 -------------------------- + arch/arm/cpu/arm_intcm/start.S | 26 -------------------------- + arch/arm/cpu/armv7/omap3/lowlevel_init.S | 3 --- + arch/arm/cpu/armv7/start.S | 23 ----------------------- + arch/arm/cpu/pxa/start.S | 27 --------------------------- + arch/arm/cpu/sa1100/start.S | 26 -------------------------- + arch/arm/lib/board.c | 12 ++++++------ + board/armltd/integrator/lowlevel_init.S | 2 +- + board/cm4008/flash.c | 2 +- + board/cm41xx/flash.c | 2 +- + board/mpl/vcma9/lowlevel_init.S | 5 +---- + board/samsung/goni/lowlevel_init.S | 3 --- + board/samsung/smdk2410/lowlevel_init.S | 5 +---- + board/samsung/smdkc100/lowlevel_init.S | 3 --- + board/ti/omap5912osk/lowlevel_init.S | 4 ---- + common/board_f.c | 14 +++----------- + common/board_r.c | 4 ++-- + include/asm-generic/sections.h | 26 +++++++------------------- + 26 files changed, 24 insertions(+), 369 deletions(-) + +diff --git a/README b/README +index d4eb099..5b7dec9 100644 +--- a/README ++++ b/README +@@ -3707,12 +3707,6 @@ Configuration Settings: + its config.mk file). If you find problems enabling this option on + your board please report the problem and send patches! + +-- CONFIG_SYS_SYM_OFFSETS +- This is set by architectures that use offsets for link symbols +- instead of absolute values. So bss_start is obtained using an +- offset _bss_start_ofs from CONFIG_SYS_TEXT_BASE, rather than +- directly. You should not need to touch this setting. +- + - CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC (OMAP only) + This is set by OMAP boards for the max time that reset should + be asserted. See doc/README.omap-reset-time for details on how +diff --git a/arch/arm/cpu/arm1136/start.S b/arch/arm/cpu/arm1136/start.S +index 00d1b30..3e2358e 100644 +--- a/arch/arm/cpu/arm1136/start.S ++++ b/arch/arm/cpu/arm1136/start.S +@@ -70,32 +70,6 @@ _end_vect: + ************************************************************************* + */ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- * Subtracting _start from them lets the linker put their +- * relative position in the executable instead of leaving +- * them null. +- */ +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + #ifdef CONFIG_USE_IRQ + /* IRQ stack memory (calculated at run-time) */ + .globl IRQ_STACK_START +@@ -295,7 +269,6 @@ cpu_init_crit: + #ifdef CONFIG_SPL_BUILD + .align 5 + do_hang: +- ldr sp, _TEXT_BASE /* use 32 words about stack */ + bl hang /* hang and never return */ + #else /* !CONFIG_SPL_BUILD */ + .align 5 +diff --git a/arch/arm/cpu/arm1176/start.S b/arch/arm/cpu/arm1176/start.S +index ffd7dd0..ce62011 100644 +--- a/arch/arm/cpu/arm1176/start.S ++++ b/arch/arm/cpu/arm1176/start.S +@@ -77,33 +77,6 @@ _end_vect: + ************************************************************************* + */ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- * Subtracting _start from them lets the linker put their +- * relative position in the executable instead of leaving +- * them null. +- */ +- +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + /* IRQ stack memory (calculated at run-time) + 8 bytes */ + .globl IRQ_STACK_START_IN + IRQ_STACK_START_IN: +diff --git a/arch/arm/cpu/arm720t/start.S b/arch/arm/cpu/arm720t/start.S +index f180eb8..1a34842 100644 +--- a/arch/arm/cpu/arm720t/start.S ++++ b/arch/arm/cpu/arm720t/start.S +@@ -67,32 +67,6 @@ _pad: .word 0x12345678 /* now 16*4=64 */ + ************************************************************************* + */ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- * Subtracting _start from them lets the linker put their +- * relative position in the executable instead of leaving +- * them null. +- */ +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + #ifdef CONFIG_USE_IRQ + /* IRQ stack memory (calculated at run-time) */ + .globl IRQ_STACK_START +diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S +index a67b659..7bf094a 100644 +--- a/arch/arm/cpu/arm920t/start.S ++++ b/arch/arm/cpu/arm920t/start.S +@@ -55,32 +55,6 @@ _fiq: .word fiq + ************************************************************************* + */ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- * Subtracting _start from them lets the linker put their +- * relative position in the executable instead of leaving +- * them null. +- */ +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + #ifdef CONFIG_USE_IRQ + /* IRQ stack memory (calculated at run-time) */ + .globl IRQ_STACK_START +diff --git a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S +index e83968f..a9ec81a 100644 +--- a/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S ++++ b/arch/arm/cpu/arm926ejs/at91/lowlevel_init.S +@@ -26,27 +26,18 @@ + #define CONFIG_SYS_MATRIX_EBICSA_VAL CONFIG_SYS_MATRIX_EBI0CSA_VAL + #endif + +-_TEXT_BASE: +- .word CONFIG_SYS_TEXT_BASE +- + .globl lowlevel_init + .type lowlevel_init,function + lowlevel_init: + +- mov r5, pc /* r5 = POS1 + 4 current */ + POS1: ++ adr r5, POS1 /* r5 = POS1 run time */ + ldr r0, =POS1 /* r0 = POS1 compile */ +- ldr r2, _TEXT_BASE +- sub r0, r0, r2 /* r0 = POS1-_TEXT_BASE (POS1 relative) */ + sub r5, r5, r0 /* r0 = CONFIG_SYS_TEXT_BASE-1 */ +- sub r5, r5, #4 /* r1 = text base - current */ + + /* memory control configuration 1 */ + ldr r0, =SMRDATA + ldr r2, =SMRDATA1 +- ldr r1, _TEXT_BASE +- sub r0, r0, r1 +- sub r2, r2, r1 + add r0, r0, r5 + add r2, r2, r5 + 0: +@@ -149,9 +140,6 @@ PLL_setup_end: + + ldr r0, =SMRDATA1 + ldr r2, =SMRDATA2 +- ldr r1, _TEXT_BASE +- sub r0, r0, r1 +- sub r2, r2, r1 + add r0, r0, r5 + add r2, r2, r5 + 2: +diff --git a/arch/arm/cpu/arm926ejs/mxs/start.S b/arch/arm/cpu/arm926ejs/mxs/start.S +index 5de2bad..34a0fcb 100644 +--- a/arch/arm/cpu/arm926ejs/mxs/start.S ++++ b/arch/arm/cpu/arm926ejs/mxs/start.S +@@ -101,32 +101,6 @@ fiq: + ************************************************************************* + */ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#ifdef CONFIG_SPL_TEXT_BASE +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- * Subtracting _start from them lets the linker put their +- * relative position in the executable instead of leaving +- * them null. +- */ +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + #ifdef CONFIG_USE_IRQ + /* IRQ stack memory (calculated at run-time) */ + .globl IRQ_STACK_START +@@ -207,6 +181,5 @@ _reset: + bx lr + + _hang: +- ldr sp, _TEXT_BASE /* switch to abort stack */ + 1: + bl 1b /* hang and never return */ +diff --git a/arch/arm/cpu/arm926ejs/start.S b/arch/arm/cpu/arm926ejs/start.S +index 5360f55..0717327 100644 +--- a/arch/arm/cpu/arm926ejs/start.S ++++ b/arch/arm/cpu/arm926ejs/start.S +@@ -102,32 +102,6 @@ _fiq: + ************************************************************************* + */ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- * Subtracting _start from them lets the linker put their +- * relative position in the executable instead of leaving +- * them null. +- */ +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + #ifdef CONFIG_USE_IRQ + /* IRQ stack memory (calculated at run-time) */ + .globl IRQ_STACK_START +@@ -330,7 +304,6 @@ flush_dcache: + #ifdef CONFIG_SPL_BUILD + .align 5 + do_hang: +- ldr sp, _TEXT_BASE /* switch to abort stack */ + 1: + bl 1b /* hang and never return */ + #else /* !CONFIG_SPL_BUILD */ +diff --git a/arch/arm/cpu/arm946es/start.S b/arch/arm/cpu/arm946es/start.S +index e16b088..7d50145 100644 +--- a/arch/arm/cpu/arm946es/start.S ++++ b/arch/arm/cpu/arm946es/start.S +@@ -71,32 +71,6 @@ _vectors_end: + ************************************************************************* + */ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- * Subtracting _start from them lets the linker put their +- * relative position in the executable instead of leaving +- * them null. +- */ +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + #ifdef CONFIG_USE_IRQ + /* IRQ stack memory (calculated at run-time) */ + .globl IRQ_STACK_START +diff --git a/arch/arm/cpu/arm_intcm/start.S b/arch/arm/cpu/arm_intcm/start.S +index 5783df1..7404ea7 100644 +--- a/arch/arm/cpu/arm_intcm/start.S ++++ b/arch/arm/cpu/arm_intcm/start.S +@@ -67,32 +67,6 @@ _fiq: + ************************************************************************* + */ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- * Subtracting _start from them lets the linker put their +- * relative position in the executable instead of leaving +- * them null. +- */ +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + #ifdef CONFIG_USE_IRQ + /* IRQ stack memory (calculated at run-time) */ + .globl IRQ_STACK_START +diff --git a/arch/arm/cpu/armv7/omap3/lowlevel_init.S b/arch/arm/cpu/armv7/omap3/lowlevel_init.S +index 6f7261b..78577b1 100644 +--- a/arch/arm/cpu/armv7/omap3/lowlevel_init.S ++++ b/arch/arm/cpu/armv7/omap3/lowlevel_init.S +@@ -17,9 +17,6 @@ + #include <asm/arch/clocks_omap3.h> + #include <linux/linkage.h> + +-_TEXT_BASE: +- .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ +- + #ifdef CONFIG_SPL_BUILD + ENTRY(save_boot_params) + ldr r4, =omap3_boot_device +diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S +index 5aac773..ac1e55a 100644 +--- a/arch/arm/cpu/armv7/start.S ++++ b/arch/arm/cpu/armv7/start.S +@@ -70,29 +70,6 @@ _end_vect: + * + *************************************************************************/ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- */ +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + #ifdef CONFIG_USE_IRQ + /* IRQ stack memory (calculated at run-time) */ + .globl IRQ_STACK_START +diff --git a/arch/arm/cpu/pxa/start.S b/arch/arm/cpu/pxa/start.S +index d8fb812..ae0d13c 100644 +--- a/arch/arm/cpu/pxa/start.S ++++ b/arch/arm/cpu/pxa/start.S +@@ -84,32 +84,6 @@ _end_vect: + ************************************************************************* + */ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- * Subtracting _start from them lets the linker put their +- * relative position in the executable instead of leaving +- * them null. +- */ +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + #ifdef CONFIG_USE_IRQ + /* IRQ stack memory (calculated at run-time) */ + .globl IRQ_STACK_START +@@ -316,7 +290,6 @@ cpu_init_crit: + #ifdef CONFIG_SPL_BUILD + .align 5 + do_hang: +- ldr sp, _TEXT_BASE /* use 32 words about stack */ + bl hang /* hang and never return */ + #else /* !CONFIG_SPL_BUILD */ + .align 5 +diff --git a/arch/arm/cpu/sa1100/start.S b/arch/arm/cpu/sa1100/start.S +index 27bcda5..bf80937 100644 +--- a/arch/arm/cpu/sa1100/start.S ++++ b/arch/arm/cpu/sa1100/start.S +@@ -56,32 +56,6 @@ _fiq: .word fiq + ************************************************************************* + */ + +-.globl _TEXT_BASE +-_TEXT_BASE: +-#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_TEXT_BASE) +- .word CONFIG_SPL_TEXT_BASE +-#else +- .word CONFIG_SYS_TEXT_BASE +-#endif +- +-/* +- * These are defined in the board-specific linker script. +- * Subtracting _start from them lets the linker put their +- * relative position in the executable instead of leaving +- * them null. +- */ +-.globl _bss_start_ofs +-_bss_start_ofs: +- .word __bss_start - _start +- +-.globl _bss_end_ofs +-_bss_end_ofs: +- .word __bss_end - _start +- +-.globl _end_ofs +-_end_ofs: +- .word _end - _start +- + #ifdef CONFIG_USE_IRQ + /* IRQ stack memory (calculated at run-time) */ + .globl IRQ_STACK_START +diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c +index c320a35..1de5812 100644 +--- a/arch/arm/lib/board.c ++++ b/arch/arm/lib/board.c +@@ -105,8 +105,8 @@ static int display_banner(void) + { + printf("\n\n%s\n\n", version_string); + debug("U-Boot code: %08lX -> %08lX BSS: -> %08lX\n", +- _TEXT_BASE, +- _bss_start_ofs + _TEXT_BASE, _bss_end_ofs + _TEXT_BASE); ++ (ulong)&_start, ++ (ulong)&__bss_start, (ulong)&__bss_end); + #ifdef CONFIG_MODEM_SUPPORT + debug("Modem Support enabled\n"); + #endif +@@ -277,13 +277,13 @@ void board_init_f(ulong bootflag) + + memset((void *)gd, 0, sizeof(gd_t)); + +- gd->mon_len = _bss_end_ofs; ++ gd->mon_len = (ulong)&__bss_end - (ulong)_start; + #ifdef CONFIG_OF_EMBED + /* Get a pointer to the FDT */ + gd->fdt_blob = _binary_dt_dtb_start; + #elif defined CONFIG_OF_SEPARATE + /* FDT is at end of image */ +- gd->fdt_blob = (void *)(_end_ofs + _TEXT_BASE); ++ gd->fdt_blob = &_end; + #endif + /* Allow the early environment to override the fdt address */ + gd->fdt_blob = (void *)getenv_ulong("fdtcontroladdr", 16, +@@ -451,7 +451,7 @@ void board_init_f(ulong bootflag) + + gd->relocaddr = addr; + gd->start_addr_sp = addr_sp; +- gd->reloc_off = addr - _TEXT_BASE; ++ gd->reloc_off = addr - (ulong)&_start; + debug("relocation Offset is: %08lx\n", gd->reloc_off); + if (new_fdt) { + memcpy(new_fdt, gd->fdt_blob, fdt_size); +@@ -516,7 +516,7 @@ void board_init_r(gd_t *id, ulong dest_addr) + gd->flags |= GD_FLG_RELOC; /* tell others: relocation done */ + bootstage_mark_name(BOOTSTAGE_ID_START_UBOOT_R, "board_init_r"); + +- monitor_flash_len = _end_ofs; ++ monitor_flash_len = (ulong)&__rel_dyn_end - (ulong)_start; + + /* Enable caches */ + enable_caches(); +diff --git a/board/armltd/integrator/lowlevel_init.S b/board/armltd/integrator/lowlevel_init.S +index 389d5e9..0fb42ad 100644 +--- a/board/armltd/integrator/lowlevel_init.S ++++ b/board/armltd/integrator/lowlevel_init.S +@@ -183,7 +183,7 @@ cm_remap: + + /* Now 0x00000000 is writeable, replace the vectors */ + ldr r0, =_start /* r0 <- start of vectors */ +- ldr r2, =_TEXT_BASE /* r2 <- past vectors */ ++ add r2, r0, #64 /* r2 <- past vectors */ + sub r1,r1,r1 /* destination 0x00000000 */ + + copy_vec: +diff --git a/board/cm4008/flash.c b/board/cm4008/flash.c +index 2511928..8315a57 100644 +--- a/board/cm4008/flash.c ++++ b/board/cm4008/flash.c +@@ -57,7 +57,7 @@ unsigned long flash_init (void) + */ + flash_protect (FLAG_PROTECT_SET, + CONFIG_SYS_FLASH_BASE, +- CONFIG_SYS_FLASH_BASE + _bss_start_ofs, ++ CONFIG_SYS_FLASH_BASE + (__bss_end - __bss_start), + &flash_info[0]); + + return size; +diff --git a/board/cm41xx/flash.c b/board/cm41xx/flash.c +index 2511928..8315a57 100644 +--- a/board/cm41xx/flash.c ++++ b/board/cm41xx/flash.c +@@ -57,7 +57,7 @@ unsigned long flash_init (void) + */ + flash_protect (FLAG_PROTECT_SET, + CONFIG_SYS_FLASH_BASE, +- CONFIG_SYS_FLASH_BASE + _bss_start_ofs, ++ CONFIG_SYS_FLASH_BASE + (__bss_end - __bss_start), + &flash_info[0]); + + return size; +diff --git a/board/mpl/vcma9/lowlevel_init.S b/board/mpl/vcma9/lowlevel_init.S +index b889cf9..cca9c0c 100644 +--- a/board/mpl/vcma9/lowlevel_init.S ++++ b/board/mpl/vcma9/lowlevel_init.S +@@ -197,13 +197,10 @@ + #define REFCNT_266 0 + /**************************************/ + +-_TEXT_BASE: +- .word CONFIG_SYS_TEXT_BASE +- + .globl lowlevel_init + lowlevel_init: + /* use r0 to relocate DATA read/write to flash rather than memory ! */ +- ldr r0, _TEXT_BASE ++ ldr r0, =CONFIG_SYS_TEXT_BASE + ldr r13, =BWSCON + + /* enable minimal access to PLD */ +diff --git a/board/samsung/goni/lowlevel_init.S b/board/samsung/goni/lowlevel_init.S +index 726211a..d52bc09 100644 +--- a/board/samsung/goni/lowlevel_init.S ++++ b/board/samsung/goni/lowlevel_init.S +@@ -22,9 +22,6 @@ + * r9 has Mobile DDR size, 1 means 1GiB, 2 means 2GiB and so on + */ + +-_TEXT_BASE: +- .word CONFIG_SYS_TEXT_BASE +- + .globl lowlevel_init + lowlevel_init: + mov r11, lr +diff --git a/board/samsung/smdk2410/lowlevel_init.S b/board/samsung/smdk2410/lowlevel_init.S +index c7b78fd..5de04f1 100644 +--- a/board/samsung/smdk2410/lowlevel_init.S ++++ b/board/samsung/smdk2410/lowlevel_init.S +@@ -110,16 +110,13 @@ + #define REFCNT 1113 /* period=15.6us, HCLK=60Mhz, (2048+1-15.6*60) */ + /**************************************/ + +-_TEXT_BASE: +- .word CONFIG_SYS_TEXT_BASE +- + .globl lowlevel_init + lowlevel_init: + /* memory control configuration */ + /* make r0 relative the current location so that it */ + /* reads SMRDATA out of FLASH rather than memory ! */ + ldr r0, =SMRDATA +- ldr r1, _TEXT_BASE ++ ldr r1, =CONFIG_SYS_TEXT_BASE + sub r0, r0, r1 + ldr r1, =BWSCON /* Bus Width Status Controller */ + add r2, r0, #13*4 +diff --git a/board/samsung/smdkc100/lowlevel_init.S b/board/samsung/smdkc100/lowlevel_init.S +index 4df0974..65e6b7a 100644 +--- a/board/samsung/smdkc100/lowlevel_init.S ++++ b/board/samsung/smdkc100/lowlevel_init.S +@@ -17,9 +17,6 @@ + * r5 has zero always + */ + +-_TEXT_BASE: +- .word CONFIG_SYS_TEXT_BASE +- + .globl lowlevel_init + lowlevel_init: + mov r9, lr +diff --git a/board/ti/omap5912osk/lowlevel_init.S b/board/ti/omap5912osk/lowlevel_init.S +index cad0a5a..e05a1c7 100644 +--- a/board/ti/omap5912osk/lowlevel_init.S ++++ b/board/ti/omap5912osk/lowlevel_init.S +@@ -18,10 +18,6 @@ + #include <./configs/omap1510.h> + #endif + +- +-_TEXT_BASE: +- .word CONFIG_SYS_TEXT_BASE /* sdram load addr from config.mk */ +- + .globl lowlevel_init + lowlevel_init: + +diff --git a/common/board_f.c b/common/board_f.c +index 02965b0..5b9ba07 100644 +--- a/common/board_f.c ++++ b/common/board_f.c +@@ -149,13 +149,9 @@ static int display_text_info(void) + #ifndef CONFIG_SANDBOX + ulong bss_start, bss_end; + +-#ifdef CONFIG_SYS_SYM_OFFSETS +- bss_start = _bss_start_ofs + _TEXT_BASE; +- bss_end = _bss_end_ofs + _TEXT_BASE; +-#else + bss_start = (ulong)&__bss_start; + bss_end = (ulong)&__bss_end; +-#endif ++ + debug("U-Boot code: %08X -> %08lX BSS: -> %08lX\n", + CONFIG_SYS_TEXT_BASE, bss_start, bss_end); + #endif +@@ -279,8 +275,8 @@ static int zero_global_data(void) + + static int setup_mon_len(void) + { +-#ifdef CONFIG_SYS_SYM_OFFSETS +- gd->mon_len = _bss_end_ofs; ++#ifdef __ARM__ ++ gd->mon_len = (ulong)&__bss_end - (ulong)_start; + #elif defined(CONFIG_SANDBOX) + gd->mon_len = (ulong)&_end - (ulong)_init; + #else +@@ -363,11 +359,7 @@ static int setup_fdt(void) + gd->fdt_blob = __dtb_dt_begin; + #elif defined CONFIG_OF_SEPARATE + /* FDT is at end of image */ +-# ifdef CONFIG_SYS_SYM_OFFSETS +- gd->fdt_blob = (void *)(_end_ofs + CONFIG_SYS_TEXT_BASE); +-# else + gd->fdt_blob = (ulong *)&_end; +-# endif + #elif defined(CONFIG_OF_HOSTFILE) + if (read_fdt_from_file()) { + puts("Failed to read control FDT\n"); +diff --git a/common/board_r.c b/common/board_r.c +index c2d0763..899f377 100644 +--- a/common/board_r.c ++++ b/common/board_r.c +@@ -128,8 +128,8 @@ __weak int fixup_cpu(void) + + static int initr_reloc_global_data(void) + { +-#ifdef CONFIG_SYS_SYM_OFFSETS +- monitor_flash_len = _end_ofs; ++#ifdef __ARM__ ++ monitor_flash_len = _end - __image_copy_start; + #elif !defined(CONFIG_SANDBOX) + monitor_flash_len = (ulong)&__init_end - gd->relocaddr; + #endif +diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h +index 7e1eb4b..458952f 100644 +--- a/include/asm-generic/sections.h ++++ b/include/asm-generic/sections.h +@@ -63,28 +63,16 @@ extern char __image_copy_end[]; + extern void _start(void); + + /* +- * ARM needs to use offsets for symbols, since the values of some symbols +- * are not resolved prior to relocation (and are just 0). Maybe this can be +- * resolved, or maybe other architectures are similar, iwc this should be +- * promoted to an architecture option. ++ * ARM defines its symbols as char[]. Other arches define them as ulongs. + */ + #ifdef CONFIG_ARM +-#define CONFIG_SYS_SYM_OFFSETS +-#endif +- +-#ifdef CONFIG_SYS_SYM_OFFSETS +-/* Start/end of the relocation entries, as an offset from _start */ +-extern ulong _rel_dyn_start_ofs; +-extern ulong _rel_dyn_end_ofs; +- +-/* End of the region to be relocated, as an offset form _start */ +-extern ulong _image_copy_end_ofs; + +-extern ulong _bss_start_ofs; /* BSS start relative to _start */ +-extern ulong _bss_end_ofs; /* BSS end relative to _start */ +-extern ulong _end_ofs; /* end of image relative to _start */ +- +-extern ulong _TEXT_BASE; /* code start */ ++extern char __bss_start[]; ++extern char __bss_end[]; ++extern char __image_copy_start[]; ++extern char __image_copy_end[]; ++extern char __rel_dyn_start[]; ++extern char __rel_dyn_end[]; + + #else /* don't use offsets: */ + diff --git a/unmaintained/uboot-mx6_cubox-i/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch b/unmaintained/uboot-mx6_cubox-i/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch new file mode 100644 index 000000000..4a5e0de4e --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch @@ -0,0 +1,56 @@ +[RFC 08/10] inline: use the gcc inline version instead of the c99 one. + +Jeroen Hofstee jeroen at myspectrum.nl +Sat May 31 22:32:22 CEST 2014 +Previous message: [U-Boot] [RFC 07/10] ARM: make gd a function a function for clang +Messages sorted by: [ date ] [ thread ] [ subject ] [ author ] +--- +This fixes errors like: + +make[1]: Entering directory `/home/jeroen/software/u-boot/arch/arm/cpu/armv7/omap-common' +arm-linux-gnueabi-ld.bfd -r -o libomap-common.o reset.o timer.o utils.o +timer.o: In function `get_tbclk': +/home/jeroen/software/u-boot/include/asm/io.h:81: multiple definition of `__raw_writesb' +reset.o:/home/jeroen/software/u-boot/include/asm/io.h:81: first defined here +timer.o: In function `__udelay': +/home/jeroen/software/u-boot/include/asm/io.h:88: multiple definition of `__raw_writesw' +reset.o:/home/jeroen/software/u-boot/include/asm/io.h:88: first defined here +timer.o: In function `get_ticks': +/home/jeroen/software/u-boot/include/asm/io.h:95: multiple definition of `__raw_writesl' +reset.o:/home/jeroen/software/u-boot/include/asm/io.h:95: first defined here +timer.o: In function `__raw_readsb': +/home/jeroen/software/u-boot/include/asm/io.h:102: multiple definition of `__raw_readsb' +reset.o:/home/jeroen/software/u-boot/include/asm/io.h:102: first defined here +timer.o: In function `__raw_readsw': +/home/jeroen/software/u-boot/include/asm/io.h:109: multiple definition of `__raw_readsw' +reset.o:/home/jeroen/software/u-boot/include/asm/io.h:109: first defined here +timer.o: In function `__raw_readsl': +/home/jeroen/software/u-boot/include/asm/io.h:116: multiple definition of `__raw_readsl' +reset.o:/home/jeroen/software/u-boot/include/asm/io.h:116: first defined here +make[1]: *** [libomap-common.o] Error 1 +make[1]: Leaving directory `/home/jeroen/software/u-boot/arch/arm/cpu/armv7/omap-common' +make: *** [arch/arm/cpu/armv7/omap-common/libomap-common.o] Error 2 +--- + include/linux/compiler-gcc.h | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h +index 9896e54..99c6dcc 100644 +--- a/include/linux/compiler-gcc.h ++++ b/include/linux/compiler-gcc.h +@@ -44,9 +44,10 @@ + */ + #if !defined(CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING) || \ + !defined(CONFIG_OPTIMIZE_INLINING) || (__GNUC__ < 4) +-# define inline inline __attribute__((always_inline)) +-# define __inline__ __inline__ __attribute__((always_inline)) +-# define __inline __inline __attribute__((always_inline)) ++/* XXX: check __GNUC_STDC_INLINE__, fix line length */ ++# define inline inline __attribute__((always_inline)) __attribute__((__gnu_inline__)) ++# define __inline__ __inline__ __attribute__((always_inline)) __attribute__((__gnu_inline__)) ++# define __inline __inline __attribute__((always_inline)) __attribute__((__gnu_inline__)) + #endif + + #define __deprecated __attribute__((deprecated)) +-- +1.8.3.2 diff --git a/unmaintained/uboot-mx6_cubox-i/uboot-mx6_cubox-i.install b/unmaintained/uboot-mx6_cubox-i/uboot-mx6_cubox-i.install new file mode 100644 index 000000000..ff3b52d2a --- /dev/null +++ b/unmaintained/uboot-mx6_cubox-i/uboot-mx6_cubox-i.install @@ -0,0 +1,25 @@ +flash_uboot() { + echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0." + echo "Do you want to do this now? [y|N]" + read -r shouldwe + if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then + dd if=/boot/uboot-cubox-i-linux-libre/SPL of=/dev/mmcblk0 bs=1K seek=1 + dd if=/boot/uboot-cubox-i-linux-libre/u-boot.img of=/dev/mmcblk0 bs=1K seek=42 + sync + else + echo "You can do this later by running:" + echo "# dd if=/boot/uboot-cubox-i-linux-libre/SPL of=/dev/mmcblk0 bs=1K seek=1" + echo "# dd dd if=/boot/uboot-cubox-i-linux-libre/u-boot.img of=/dev/mmcblk0 bs=1K seek=42" + fi +} + +## arg 1: the new package version +post_install() { + flash_uboot +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + flash_uboot +} diff --git a/unmaintained/uboot-nitrogen6q/0001-parabola-arm-modifications.patch b/unmaintained/uboot-nitrogen6q/0001-parabola-arm-modifications.patch new file mode 100644 index 000000000..fe4b43820 --- /dev/null +++ b/unmaintained/uboot-nitrogen6q/0001-parabola-arm-modifications.patch @@ -0,0 +1,25 @@ +diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h +index f3efbb0..7dfaffc 100644 +--- a/include/configs/nitrogen6x.h ++++ b/include/configs/nitrogen6x.h +@@ -82,6 +82,8 @@ + #define CONFIG_CMD_EXT4 + #define CONFIG_CMD_FS_GENERIC + #define CONFIG_DOS_PARTITION ++#define CONFIG_CMD_PART ++#define CONFIG_PARTITION_UUIDS + + #ifdef CONFIG_MX6Q + #define CONFIG_CMD_SATA +@@ -195,6 +197,8 @@ + #define CONFIG_DRIVE_TYPES CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC CONFIG_DRIVE_USB + #define CONFIG_UMSDEVS CONFIG_DRIVE_SATA CONFIG_DRIVE_MMC + ++#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre" ++ + #if defined(CONFIG_SABRELITE) + #define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ +-- +2.4.4 + diff --git a/unmaintained/uboot-nitrogen6q/0002-kernel-add-support-for-gcc-5.patch b/unmaintained/uboot-nitrogen6q/0002-kernel-add-support-for-gcc-5.patch new file mode 100644 index 000000000..30718c561 --- /dev/null +++ b/unmaintained/uboot-nitrogen6q/0002-kernel-add-support-for-gcc-5.patch @@ -0,0 +1,97 @@ +From 5b07fc2c680ad4279a45d863108544020b4d74cd Mon Sep 17 00:00:00 2001 +From: Sasha Levin <sasha.levin@oracle.com> +Date: Mon, 13 Oct 2014 15:51:05 -0700 +Subject: [PATCH 2/6] kernel: add support for gcc 5 + +We're missing include/linux/compiler-gcc5.h which is required now +because gcc branched off to v5 in trunk. + +Just copy the relevant bits out of include/linux/compiler-gcc4.h, +no new code is added as of now. + +This fixes a build error when using gcc 5. + +Signed-off-by: Sasha Levin <sasha.levin@oracle.com> +Cc: <stable@vger.kernel.org> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +--- + include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + create mode 100644 include/linux/compiler-gcc5.h + +diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h +new file mode 100644 +index 0000000..cdd1cc2 +--- /dev/null ++++ b/include/linux/compiler-gcc5.h +@@ -0,0 +1,66 @@ ++#ifndef __LINUX_COMPILER_H ++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." ++#endif ++ ++#define __used __attribute__((__used__)) ++#define __must_check __attribute__((warn_unused_result)) ++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) ++ ++/* Mark functions as cold. gcc will assume any path leading to a call ++ to them will be unlikely. This means a lot of manual unlikely()s ++ are unnecessary now for any paths leading to the usual suspects ++ like BUG(), printk(), panic() etc. [but let's keep them for now for ++ older compilers] ++ ++ Early snapshots of gcc 4.3 don't support this and we can't detect this ++ in the preprocessor, but we can live with this because they're unreleased. ++ Maketime probing would be overkill here. ++ ++ gcc also has a __attribute__((__hot__)) to move hot functions into ++ a special section, but I don't see any sense in this right now in ++ the kernel context */ ++#define __cold __attribute__((__cold__)) ++ ++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) ++ ++#ifndef __CHECKER__ ++# define __compiletime_warning(message) __attribute__((warning(message))) ++# define __compiletime_error(message) __attribute__((error(message))) ++#endif /* __CHECKER__ */ ++ ++/* ++ * Mark a position in code as unreachable. This can be used to ++ * suppress control flow warnings after asm blocks that transfer ++ * control elsewhere. ++ * ++ * Early snapshots of gcc 4.5 don't support this and we can't detect ++ * this in the preprocessor, but we can live with this because they're ++ * unreleased. Really, we need to have autoconf for the kernel. ++ */ ++#define unreachable() __builtin_unreachable() ++ ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) ++ ++/* ++ * Tell the optimizer that something else uses this function or variable. ++ */ ++#define __visible __attribute__((externally_visible)) ++ ++/* ++ * GCC 'asm goto' miscompiles certain code sequences: ++ * ++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 ++ * ++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. ++ * Fixed in GCC 4.8.2 and later versions. ++ * ++ * (asm goto is automatically volatile - the naming reflects this.) ++ */ ++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) ++ ++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP ++#define __HAVE_BUILTIN_BSWAP32__ ++#define __HAVE_BUILTIN_BSWAP64__ ++#define __HAVE_BUILTIN_BSWAP16__ ++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ +-- +2.4.4 + diff --git a/unmaintained/uboot-nitrogen6q/0003-ARM-asm-io.h-use-static-inline.patch b/unmaintained/uboot-nitrogen6q/0003-ARM-asm-io.h-use-static-inline.patch new file mode 100644 index 000000000..14ff6a5d8 --- /dev/null +++ b/unmaintained/uboot-nitrogen6q/0003-ARM-asm-io.h-use-static-inline.patch @@ -0,0 +1,76 @@ +From 282ed8801c3e75e4c94943f56d399d630833591b Mon Sep 17 00:00:00 2001 +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Sun, 22 Jun 2014 23:10:39 +0200 +Subject: [PATCH 3/6] ARM:asm:io.h use static inline + +When compiling u-boot with W=1 the extern inline void for +read* is likely causing the most noise. gcc / clang will +warn there is never a actual declaration for these functions. +Instead of declaring these extern make them static inline so +it is actually declared. + +cc: Albert ARIBAUD <albert.u.boot@aribaud.net> +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +--- + arch/arm/include/asm/io.h | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h +index 214f3ea..dc6138a 100644 +--- a/arch/arm/include/asm/io.h ++++ b/arch/arm/include/asm/io.h +@@ -77,7 +77,7 @@ static inline phys_addr_t virt_to_phys(void * vaddr) + #define __arch_putl(v,a) (*(volatile unsigned int *)(a) = (v)) + #define __arch_putq(v,a) (*(volatile unsigned long long *)(a) = (v)) + +-extern inline void __raw_writesb(unsigned long addr, const void *data, ++static inline void __raw_writesb(unsigned long addr, const void *data, + int bytelen) + { + uint8_t *buf = (uint8_t *)data; +@@ -85,7 +85,7 @@ extern inline void __raw_writesb(unsigned long addr, const void *data, + __arch_putb(*buf++, addr); + } + +-extern inline void __raw_writesw(unsigned long addr, const void *data, ++static inline void __raw_writesw(unsigned long addr, const void *data, + int wordlen) + { + uint16_t *buf = (uint16_t *)data; +@@ -93,7 +93,7 @@ extern inline void __raw_writesw(unsigned long addr, const void *data, + __arch_putw(*buf++, addr); + } + +-extern inline void __raw_writesl(unsigned long addr, const void *data, ++static inline void __raw_writesl(unsigned long addr, const void *data, + int longlen) + { + uint32_t *buf = (uint32_t *)data; +@@ -101,21 +101,21 @@ extern inline void __raw_writesl(unsigned long addr, const void *data, + __arch_putl(*buf++, addr); + } + +-extern inline void __raw_readsb(unsigned long addr, void *data, int bytelen) ++static inline void __raw_readsb(unsigned long addr, void *data, int bytelen) + { + uint8_t *buf = (uint8_t *)data; + while(bytelen--) + *buf++ = __arch_getb(addr); + } + +-extern inline void __raw_readsw(unsigned long addr, void *data, int wordlen) ++static inline void __raw_readsw(unsigned long addr, void *data, int wordlen) + { + uint16_t *buf = (uint16_t *)data; + while(wordlen--) + *buf++ = __arch_getw(addr); + } + +-extern inline void __raw_readsl(unsigned long addr, void *data, int longlen) ++static inline void __raw_readsl(unsigned long addr, void *data, int longlen) + { + uint32_t *buf = (uint32_t *)data; + while(longlen--) +-- +2.4.4 + diff --git a/unmaintained/uboot-nitrogen6q/0004-common-main.c-make-show_boot_progress-__weak.patch b/unmaintained/uboot-nitrogen6q/0004-common-main.c-make-show_boot_progress-__weak.patch new file mode 100644 index 000000000..41b9c5cb2 --- /dev/null +++ b/unmaintained/uboot-nitrogen6q/0004-common-main.c-make-show_boot_progress-__weak.patch @@ -0,0 +1,31 @@ +From 8158ac85f16963ff1d075255cd3f34b4f0614265 Mon Sep 17 00:00:00 2001 +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Thu, 26 Jun 2014 20:18:31 +0200 +Subject: [PATCH 4/6] common: main.c: make show_boot_progress __weak + +This not only looks a bit better it also prevents a +warning with W=1 (no previous prototype). + +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +Acked-by: Simon Glass <sjg@chromium.org> +--- + common/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/common/main.c b/common/main.c +index 32618f1..2979fbe 100644 +--- a/common/main.c ++++ b/common/main.c +@@ -17,8 +17,7 @@ DECLARE_GLOBAL_DATA_PTR; + /* + * Board-specific Platform code can reimplement show_boot_progress () if needed + */ +-void inline __show_boot_progress (int val) {} +-void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress"))); ++__weak void show_boot_progress(int val) {} + + static void modem_init(void) + { +-- +2.4.4 + diff --git a/unmaintained/uboot-nitrogen6q/0005-common-board-use-__weak.patch b/unmaintained/uboot-nitrogen6q/0005-common-board-use-__weak.patch new file mode 100644 index 000000000..5cd77dbba --- /dev/null +++ b/unmaintained/uboot-nitrogen6q/0005-common-board-use-__weak.patch @@ -0,0 +1,84 @@ +From deda59a4022fcedd781a893fe5e1bb495988858f Mon Sep 17 00:00:00 2001 +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Wed, 8 Oct 2014 22:57:22 +0200 +Subject: [PATCH 5/6] common: board: use __weak + +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +--- + common/board_f.c | 10 ++-------- + common/board_r.c | 10 ++-------- + 2 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/common/board_f.c b/common/board_f.c +index 4ea4cb2..215cc4a 100644 +--- a/common/board_f.c ++++ b/common/board_f.c +@@ -130,14 +130,11 @@ int init_func_watchdog_reset(void) + } + #endif /* CONFIG_WATCHDOG */ + +-void __board_add_ram_info(int use_default) ++__weak void board_add_ram_info(int use_default) + { + /* please define platform specific board_add_ram_info() */ + } + +-void board_add_ram_info(int) +- __attribute__ ((weak, alias("__board_add_ram_info"))); +- + static int init_baud_rate(void) + { + gd->baudrate = getenv_ulong("baudrate", 10, CONFIG_BAUDRATE); +@@ -219,7 +216,7 @@ static int show_dram_config(void) + return 0; + } + +-void __dram_init_banksize(void) ++__weak void dram_init_banksize(void) + { + #if defined(CONFIG_NR_DRAM_BANKS) && defined(CONFIG_SYS_SDRAM_BASE) + gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; +@@ -227,9 +224,6 @@ void __dram_init_banksize(void) + #endif + } + +-void dram_init_banksize(void) +- __attribute__((weak, alias("__dram_init_banksize"))); +- + #if defined(CONFIG_HARD_I2C) || defined(CONFIG_SYS_I2C) + static int init_func_i2c(void) + { +diff --git a/common/board_r.c b/common/board_r.c +index 602a239..fa4bd9c 100644 +--- a/common/board_r.c ++++ b/common/board_r.c +@@ -60,7 +60,7 @@ DECLARE_GLOBAL_DATA_PTR; + + ulong monitor_flash_len; + +-int __board_flash_wp_on(void) ++__weak int board_flash_wp_on(void) + { + /* + * Most flashes can't be detected when write protection is enabled, +@@ -70,16 +70,10 @@ int __board_flash_wp_on(void) + return 0; + } + +-int board_flash_wp_on(void) +- __attribute__ ((weak, alias("__board_flash_wp_on"))); +- +-void __cpu_secondary_init_r(void) ++__weak void cpu_secondary_init_r(void) + { + } + +-void cpu_secondary_init_r(void) +- __attribute__ ((weak, alias("__cpu_secondary_init_r"))); +- + static int initr_secondary_cpu(void) + { + /* +-- +2.4.4 + diff --git a/unmaintained/uboot-nitrogen6q/0006-common-board_f-cosmetic-use-__weak-for-leds.patch b/unmaintained/uboot-nitrogen6q/0006-common-board_f-cosmetic-use-__weak-for-leds.patch new file mode 100644 index 000000000..bff38b486 --- /dev/null +++ b/unmaintained/uboot-nitrogen6q/0006-common-board_f-cosmetic-use-__weak-for-leds.patch @@ -0,0 +1,109 @@ +From 137c23ed9e6ad2cba575842065bffa6e59170e17 Mon Sep 17 00:00:00 2001 +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Mon, 23 Jun 2014 23:20:19 +0200 +Subject: [PATCH 6/6] common: board_f: cosmetic use __weak for leds + +First of all this looks a lot better, but it also +prevents a gcc warning (W=1), that the weak function +has no previous prototype. + +cc: Simon Glass <sjg@chromium.org> +Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> +Acked-by: Simon Glass <sjg@chromium.org> +--- + common/board_f.c | 29 ++++++++++------------------- + include/status_led.h | 22 +++++++++++----------- + 2 files changed, 21 insertions(+), 30 deletions(-) + +diff --git a/common/board_f.c b/common/board_f.c +index 215cc4a..6e955bb 100644 +--- a/common/board_f.c ++++ b/common/board_f.c +@@ -37,6 +37,7 @@ + #include <os.h> + #include <post.h> + #include <spi.h> ++#include <status_led.h> + #include <trace.h> + #include <watchdog.h> + #include <asm/errno.h> +@@ -78,25 +79,15 @@ DECLARE_GLOBAL_DATA_PTR; + ************************************************************************ + * May be supplied by boards if desired + */ +-inline void __coloured_LED_init(void) {} +-void coloured_LED_init(void) +- __attribute__((weak, alias("__coloured_LED_init"))); +-inline void __red_led_on(void) {} +-void red_led_on(void) __attribute__((weak, alias("__red_led_on"))); +-inline void __red_led_off(void) {} +-void red_led_off(void) __attribute__((weak, alias("__red_led_off"))); +-inline void __green_led_on(void) {} +-void green_led_on(void) __attribute__((weak, alias("__green_led_on"))); +-inline void __green_led_off(void) {} +-void green_led_off(void) __attribute__((weak, alias("__green_led_off"))); +-inline void __yellow_led_on(void) {} +-void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on"))); +-inline void __yellow_led_off(void) {} +-void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off"))); +-inline void __blue_led_on(void) {} +-void blue_led_on(void) __attribute__((weak, alias("__blue_led_on"))); +-inline void __blue_led_off(void) {} +-void blue_led_off(void) __attribute__((weak, alias("__blue_led_off"))); ++__weak void coloured_LED_init(void) {} ++__weak void red_led_on(void) {} ++__weak void red_led_off(void) {} ++__weak void green_led_on(void) {} ++__weak void green_led_off(void) {} ++__weak void yellow_led_on(void) {} ++__weak void yellow_led_off(void) {} ++__weak void blue_led_on(void) {} ++__weak void blue_led_off(void) {} + + /* + * Why is gd allocated a register? Prior to reloc it might be better to +diff --git a/include/status_led.h b/include/status_led.h +index 0eb91b8..b8aaaf7 100644 +--- a/include/status_led.h ++++ b/include/status_led.h +@@ -272,19 +272,21 @@ extern void __led_set (led_id_t mask, int state); + # include <asm/status_led.h> + #endif + ++#endif /* CONFIG_STATUS_LED */ ++ + /* + * Coloured LEDs API + */ + #ifndef __ASSEMBLY__ +-extern void coloured_LED_init (void); +-extern void red_led_on(void); +-extern void red_led_off(void); +-extern void green_led_on(void); +-extern void green_led_off(void); +-extern void yellow_led_on(void); +-extern void yellow_led_off(void); +-extern void blue_led_on(void); +-extern void blue_led_off(void); ++void coloured_LED_init(void); ++void red_led_on(void); ++void red_led_off(void); ++void green_led_on(void); ++void green_led_off(void); ++void yellow_led_on(void); ++void yellow_led_off(void); ++void blue_led_on(void); ++void blue_led_off(void); + #else + .extern LED_init + .extern red_led_on +@@ -297,6 +299,4 @@ extern void blue_led_off(void); + .extern blue_led_off + #endif + +-#endif /* CONFIG_STATUS_LED */ +- + #endif /* _STATUS_LED_H_ */ +-- +2.4.4 + diff --git a/unmaintained/uboot-nitrogen6q/6x_bootscript b/unmaintained/uboot-nitrogen6q/6x_bootscript new file mode 100644 index 000000000..45e5fe9b6 --- /dev/null +++ b/unmaintained/uboot-nitrogen6q/6x_bootscript @@ -0,0 +1,105 @@ +echo "checking for U-Boot upgrades.."; +setenv offset 0x400 +if load ${dtype} ${disk}:1 12000000 /boot/u-boot.imx; then + echo " found u-boot.imx $filesize bytes)"; + if sf probe || sf probe || sf probe 1 27000000 || sf probe 1 27000000; then + echo "probed SPI ROM"; + if sf read 0x12400000 $offset $filesize; then + if cmp.b 0x12000000 0x12400000 $filesize; then + echo " no upgrade needed"; + else + echo " need U-Boot upgrade, flashing in 5 seconds.."; + for n in 5 4 3 2 1; do + echo $n; + sleep 1; + done + echo " erasing flash.."; + sf erase 0 0xC0000; + # two steps to prevent bricking + echo " writing flash.."; + sf write 0x12000000 $offset $filesize; + echo " verifying flash.."; + if sf read 0x12400000 $offset $filesize; then + if cmp.b 0x12000000 0x12400000 $filesize; then + echo "---- U-Boot upgraded. resetting.."; + reset; + else + echo " read verification error"; + fi + else + echo " error re-reading EEPROM"; + fi + fi + else + echo " error reading boot loader from EEPROM"; + fi + else + echo " error initializing EEPROM"; + fi; +else + echo " no U-Boot image found on SD card"; +fi + +setenv bootargs +setenv nextcon 0; + +if hdmidet ; then + setenv bootargs $bootargs video=mxcfb${nextcon}:dev=hdmi,1280x720M@60,if=RGB24 + setenv fbmem "fbmem=28M"; + setexpr nextcon $nextcon + 1 +else + echo "------ no HDMI monitor"; +fi + +i2c dev 2 +if i2c probe 0x04 ; then + setenv bootargs $bootargs video=mxcfb${nextcon}:dev=ldb,LDB-XGA,if=RGB666 + if test "0" -eq $nextcon; then + setenv fbmem "fbmem=10M"; + else + setenv fbmem ${fbmem},10M + fi + setexpr nextcon $nextcon + 1 +else + echo "------ no Freescale display"; +fi + +if i2c probe 0x38 ; then + setenv bootargs $bootargs video=mxcfb${nextcon}:dev=ldb,1024x600M@60,if=RGB666 + if test "0" -eq $nextcon; then + setenv fbmem "fbmem=10M"; + else + setenv fbmem ${fbmem},10M + fi + setexpr nextcon $nextcon + 1 +else + echo "------ no 1024x600 display"; +fi + +if i2c probe 0x48 ; then + setenv bootargs $bootargs video=mxcfb${nextcon}:dev=lcd,CLAA-WVGA,if=RGB666 + if test "0" -eq $nextcon; then + setenv fbmem "fbmem=10M"; + else + setenv fbmem ${fbmem},10M + fi + setexpr nextcon $nextcon + 1 +else + echo "------ no 800x480 display"; +fi + +while test "3" -ne $nextcon ; do + setenv bootargs $bootargs video=mxcfb${nextcon}:off ; + setexpr nextcon $nextcon + 1 ; +done + +setenv bootargs $bootargs $fbmem + +part uuid ${dtype} ${disk}:1 uuid + +setenv bootargs $bootargs console=ttymxc1,115200 vmalloc=400M root=PARTUUID=${uuid} rw rootwait consoleblank=0 + +setenv fdtfile imx6q-nitrogen6x.dtb +load ${dtype} ${disk}:1 10800000 /boot/vmlinuz-linux-libre && load ${dtype} ${disk}:1 11000000 /boot/dtbs/linux-libre/${fdtfile} && bootz 10800000 - 11000000 + +load ${dtype} ${disk}:1 10800000 /boot/uImage && bootm 10800000 diff --git a/unmaintained/uboot-nitrogen6q/PKGBUILD b/unmaintained/uboot-nitrogen6q/PKGBUILD new file mode 100644 index 000000000..d237516ce --- /dev/null +++ b/unmaintained/uboot-nitrogen6q/PKGBUILD @@ -0,0 +1,64 @@ +# U-Boot: Boundary Devices Nitrogen6X/Sabre Lite +# Maintainer: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgname=uboot-nitrogen6q +pkgver=2014.07 +pkgrel=1 +arch=('armv7h') +pkgdesc="U-Boot for Nitrogen6X/Sabre Lite" +url="https://github.com/boundarydevices/u-boot-imx6/tree/production" +license=('GPL') +makedepends=('bc') +depends=('linux-libre') +replaces=('uboot-boundary' 'uboot-boundary-linux-libre') +conflicts=('uboot4extlinux-nitrogen6q' 'uboot4grub-nitrogen6q') +backup=('6x_bootscript') +_commit=bb9dde563768731423fd6c560e95e1793a90710a +source=("https://github.com/boundarydevices/u-boot-imx6/archive/${_commit}.tar.gz" + '0001-parabola-arm-modifications.patch' + '0002-kernel-add-support-for-gcc-5.patch' + '0003-ARM-asm-io.h-use-static-inline.patch' + '0004-common-main.c-make-show_boot_progress-__weak.patch' + '0005-common-board-use-__weak.patch' + '0006-common-board_f-cosmetic-use-__weak-for-leds.patch' + '6x_bootscript') +md5sums=('b12f5f383c57de06f16625b3465e74d9' + '56466a99abaa51e000ec1b133078e084' + '721a46867e189d8dedc6b6f86a536a34' + 'f6b687eca2d2d01f741cbda90dbacb41' + '8087672256020417438b12ec4946e1cf' + 'a536d28bf45add6dbf9f84277f943de8' + '2823d0e0c3c826632f6ae934f2b746d9' + '5744da960a968fef3d078a32a63714d3') + +prepare() { + cd u-boot-imx6-${_commit} + + patch -Np1 -i ../0001-parabola-arm-modifications.patch + patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch + patch -Np1 -i ../0003-ARM-asm-io.h-use-static-inline.patch + patch -Np1 -i ../0004-common-main.c-make-show_boot_progress-__weak.patch + patch -Np1 -i ../0005-common-board-use-__weak.patch + patch -Np1 -i ../0006-common-board_f-cosmetic-use-__weak-for-leds.patch +} + +build() { + cd u-boot-imx6-${_commit} + + unset CFLAGS + unset CXXFLAGS + + make distclean + make nitrogen6q_config + make +} + +package() { + cd u-boot-imx6-${_commit} + + mkdir -p "${pkgdir}"/boot + cp u-boot.imx "${pkgdir}"/boot + tools/mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "boot script" -d ../6x_bootscript ${pkgdir}/6x_bootscript +} diff --git a/unmaintained/uboot-omap3_beagle/0001-parabola-arm-modifications.patch b/unmaintained/uboot-omap3_beagle/0001-parabola-arm-modifications.patch new file mode 100644 index 000000000..dd64718df --- /dev/null +++ b/unmaintained/uboot-omap3_beagle/0001-parabola-arm-modifications.patch @@ -0,0 +1,308 @@ +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index ff317ef..8c1639b 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -56,6 +56,7 @@ + #define BBTOYS_WIFI 0x01000B00 + #define BBTOYS_VGA 0x02000B00 + #define BBTOYS_LCD 0x03000B00 ++#define BBTOYS_ULCD 0x04000B00 + #define BCT_BRETTL3 0x01000F00 + #define BCT_BRETTL4 0x02000F00 + #define LSR_COM6L_ADPT 0x01001300 +@@ -211,25 +212,25 @@ void get_board_mem_timings(struct board_sdrc_timings *timings) + * bus 1 for the availability of an AT24C01B serial EEPROM. + * returns the device_vendor field from the EEPROM + */ +-static unsigned int get_expansion_id(void) ++static unsigned int get_expansion_id(int eeprom_address) + { + i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS); + + /* return BEAGLE_NO_EEPROM if eeprom doesn't respond */ +- if (i2c_probe(EXPANSION_EEPROM_I2C_ADDRESS) == 1) { ++ if (i2c_probe(eeprom_address) == 1) { + i2c_set_bus_num(TWL4030_I2C_BUS); + return BEAGLE_NO_EEPROM; + } + + /* read configuration data */ +- i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config, ++ i2c_read(eeprom_address, 0, 1, (u8 *)&expansion_config, + sizeof(expansion_config)); + + /* retry reading configuration data with 16bit addressing */ + if ((expansion_config.device_vendor == 0xFFFFFF00) || + (expansion_config.device_vendor == 0xFFFFFFFF)) { + printf("EEPROM is blank or 8bit addressing failed: retrying with 16bit:\n"); +- i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 2, (u8 *)&expansion_config, ++ i2c_read(eeprom_address, 0, 2, (u8 *)&expansion_config, + sizeof(expansion_config)); + } + +@@ -341,15 +342,18 @@ int misc_init_r(void) + case REVISION_AXBX: + printf("Beagle Rev Ax/Bx\n"); + setenv("beaglerev", "AxBx"); ++ setenv("musb", "musb_hdrc.fifo_mode=5"); + break; + case REVISION_CX: + printf("Beagle Rev C1/C2/C3\n"); + setenv("beaglerev", "Cx"); ++ setenv("musb", "musb_hdrc.fifo_mode=5"); + MUX_BEAGLE_C(); + break; + case REVISION_C4: + printf("Beagle Rev C4\n"); + setenv("beaglerev", "C4"); ++ setenv("musb", "musb_hdrc.fifo_mode=5"); + MUX_BEAGLE_C(); + /* Set VAUX2 to 1.8V for EHCI PHY */ + twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, +@@ -390,7 +394,7 @@ int misc_init_r(void) + generate_fake_mac = true; + } + +- switch (get_expansion_id()) { ++ switch (get_expansion_id(EXPANSION_EEPROM_I2C_ADDRESS)) { + case TINCANTOOLS_ZIPPY: + printf("Recognized Tincantools Zippy board (rev %d %s)\n", + expansion_config.revision, +@@ -473,6 +477,30 @@ int misc_init_r(void) + if (expansion_config.content == 1) + setenv(expansion_config.env_var, expansion_config.env_setting); + ++ /* Scan 0x51 as well for loop-thru boards */ ++ switch (get_expansion_id(EXPANSION_EEPROM_I2C_ADDRESS + 1)) { ++ case BBTOYS_ULCD: ++ printf("Recognized BeagleBoardToys uLCD-lite board\n"); ++ setenv("buddy2", "bbtoys-ulcd"); ++ setenv("defaultdisplay", "dvi"); ++ setenv("dvimode", "800x480MR-16@60"); ++ setenv("lcd1", "i2c mw 40 00 00; i2c mw 40 04 80; i2c mw 40 0d 05"); ++ setenv("lcdcmd", "i2c dev 1 ; run lcd1; i2c dev 0"); ++ setenv("kmsmode", "video=DVI-D-1:800x480"); ++ break; ++ case BEAGLE_NO_EEPROM: ++ printf("No EEPROM on expansion board\n"); ++ setenv("buddy2", "none"); ++ break; ++ default: ++ printf("Unrecognized expansion board: %x\n", ++ expansion_config.device_vendor); ++ setenv("buddy2", "unknown"); ++ } ++ ++ if (expansion_config.content == 1) ++ setenv(expansion_config.env_var, expansion_config.env_setting); ++ + twl4030_power_init(); + switch (get_board_revision()) { + case REVISION_XM_AB: +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 65f08a1..5058c3f 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -91,6 +91,12 @@ + #define CONFIG_USB_ETHER_MCS7830 + #define CONFIG_USB_ETHER_SMSC95XX + ++/* Parabola GNU/Linux-libre extras */ ++#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre" ++#define CONFIG_SUPPORT_RAW_INITRD ++#define CONFIG_CMD_PART ++#define CONFIG_PARTITION_UUIDS ++ + /* GPIO banks */ + #define CONFIG_OMAP3_GPIO_5 /* GPIO128..159 is in GPIO bank 5 */ + #define CONFIG_OMAP3_GPIO_6 /* GPIO160..191 is in GPIO bank 6 */ +@@ -125,50 +131,62 @@ + /* devices */ + + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "loadaddr=0x80200000\0" \ +- "rdaddr=0x81000000\0" \ ++ "loadaddr=0x82000000\0" \ ++ "rdaddr=0x88080000\0" \ + "fdt_high=0xffffffff\0" \ +- "fdtaddr=0x80f80000\0" \ +- "usbtty=cdc_acm\0" \ +- "bootfile=uImage\0" \ +- "ramdisk=ramdisk.gz\0" \ +- "bootdir=/boot\0" \ +- "bootpart=0:2\0" \ ++ "fdtaddr=0x88000000\0" \ + "console=ttyO2,115200n8\0" \ +- "mpurate=auto\0" \ +- "buddy=none\0" \ +- "optargs=\0" \ +- "camera=none\0" \ +- "vram=12M\0" \ +- "dvimode=640x480MR-16@60\0" \ +- "defaultdisplay=dvi\0" \ ++ "fdtfile=undefined\0" \ ++ "bootpart=0:1\0" \ ++ "bootdir=\0" \ ++ "fdtdir=/dtbs/linux-libre\0" \ ++ "bootfile=vmlinuz-linux-libre\0" \ ++ "rdfile=initramfs-linux-libre.img\0" \ + "mmcdev=0\0" \ +- "mmcroot=/dev/mmcblk0p2 rw\0" \ +- "mmcrootfstype=ext3 rootwait\0" \ +- "nandroot=ubi0:rootfs ubi.mtd=4\0" \ +- "nandrootfstype=ubifs\0" \ +- "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \ +- "ramrootfstype=ext2\0" \ ++ "optargs=\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "${optargs} " \ +- "mpurate=${mpurate} " \ +- "buddy=${buddy} "\ +- "camera=${camera} "\ +- "vram=${vram} " \ +- "omapfb.mode=dvi:${dvimode} " \ +- "omapdss.def_disp=${defaultdisplay} " \ +- "root=${mmcroot} " \ +- "rootfstype=${mmcrootfstype}\0" \ +- "nandargs=setenv bootargs console=${console} " \ +- "${optargs} " \ +- "mpurate=${mpurate} " \ +- "buddy=${buddy} "\ +- "camera=${camera} "\ +- "vram=${vram} " \ +- "omapfb.mode=dvi:${dvimode} " \ +- "omapdss.def_disp=${defaultdisplay} " \ +- "root=${nandroot} " \ +- "rootfstype=${nandrootfstype}\0" \ ++ "root=${root} " \ ++ "${musb} " \ ++ "${cmdline}\0" \ ++ "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ ++ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \ ++ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ ++ "mmcboot=usb start;" \ ++ "for devtype in mmc usb; do " \ ++ "setenv devnum 0;" \ ++ "while ${devtype} dev ${devnum}; do " \ ++ "echo ${devtype} found on device ${devnum};" \ ++ "setenv bootpart ${devnum}:1;" \ ++ "if test ${devtype} = mmc; then part uuid mmc ${devnum}:2 uuid; else part uuid ${devtype} ${devnum}:1 uuid; fi;" \ ++ "part uuid ${devtype} ${rootpart} uuid;" \ ++ "setenv root PARTUUID=${uuid} rw rootwait;" \ ++ "echo Checking for: ${bootdir}/uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} ${bootdir}/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from ${bootdir}/uEnv.txt;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi;" \ ++ "if run loadimage; then " \ ++ "run mmcargs;" \ ++ "if run loadfdt; then " \ ++ "if run loadrd; then " \ ++ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ ++ "else " \ ++ "bootz ${loadaddr} - ${fdtaddr};" \ ++ "fi;" \ ++ "fi;" \ ++ "else " \ ++ "echo No kernel found;" \ ++ "fi;" \ ++ "setexpr devnum ${devnum} + 1;" \ ++ "done;" \ ++ "done;\0" \ + "findfdt=" \ + "if test $beaglerev = AxBx; then " \ + "setenv fdtfile omap3-beagle.dtb; fi; " \ +@@ -181,81 +199,11 @@ + "if test $beaglerev = xMC; then " \ + "setenv fdtfile omap3-beagle-xm.dtb; fi; " \ + "if test $fdtfile = undefined; then " \ +- "echo WARNING: Could not determine device tree to use; fi; \0" \ +- "validatefdt=" \ +- "if test $beaglerev = xMAB; then " \ +- "if test ! -e mmc ${bootpart} ${bootdir}/${fdtfile}; then " \ +- "setenv fdtfile omap3-beagle-xm.dtb; " \ +- "fi; " \ +- "fi; \0" \ +- "bootenv=uEnv.txt\0" \ +- "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ +- "importbootenv=echo Importing environment from mmc ...; " \ +- "env import -t -r $loadaddr $filesize\0" \ +- "ramargs=setenv bootargs console=${console} " \ +- "${optargs} " \ +- "mpurate=${mpurate} " \ +- "buddy=${buddy} "\ +- "vram=${vram} " \ +- "omapfb.mode=dvi:${dvimode} " \ +- "omapdss.def_disp=${defaultdisplay} " \ +- "root=${ramroot} " \ +- "rootfstype=${ramrootfstype}\0" \ +- "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \ +- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ +- "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ +- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ +- "source ${loadaddr}\0" \ +- "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ +- "mmcboot=echo Booting from mmc ...; " \ +- "run mmcargs; " \ +- "bootm ${loadaddr}\0" \ +- "mmcbootz=echo Booting with DT from mmc${mmcdev} ...; " \ +- "run mmcargs; " \ +- "bootz ${loadaddr} - ${fdtaddr}\0" \ +- "nandboot=echo Booting from nand ...; " \ +- "run nandargs; " \ +- "nand read ${loadaddr} 280000 400000; " \ +- "bootm ${loadaddr}\0" \ +- "ramboot=echo Booting from ramdisk ...; " \ +- "run ramargs; " \ +- "bootm ${loadaddr}\0" \ +- "userbutton=if gpio input 173; then run userbutton_xm; " \ +- "else run userbutton_nonxm; fi;\0" \ +- "userbutton_xm=gpio input 4;\0" \ +- "userbutton_nonxm=gpio input 7;\0" +-/* "run userbutton" will return 1 (false) if pressed and 0 (true) if not */ ++ "echo WARNING: Could not determine device tree to use; fi; \0" ++ + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ +- "mmc dev ${mmcdev}; if mmc rescan; then " \ +- "if run userbutton; then " \ +- "setenv bootenv uEnv.txt;" \ +- "else " \ +- "setenv bootenv user.txt;" \ +- "fi;" \ +- "echo SD/MMC found on device ${mmcdev};" \ +- "if run loadbootenv; then " \ +- "echo Loaded environment from ${bootenv};" \ +- "run importbootenv;" \ +- "fi;" \ +- "if test -n $uenvcmd; then " \ +- "echo Running uenvcmd ...;" \ +- "run uenvcmd;" \ +- "fi;" \ +- "if run loadbootscript; then " \ +- "run bootscript; " \ +- "else " \ +- "if run loadimage; then " \ +- "run mmcboot;" \ +- "fi;" \ +- "fi; " \ +- "fi;" \ +- "run nandboot;" \ +- "setenv bootfile zImage;" \ +- "if run loadimage; then " \ +- "run loadfdt;" \ +- "run mmcbootz; " \ +- "fi; " \ ++ "run mmcboot" + + /* + * OMAP3 has 12 GP timers, they can be driven by the system clock +-- +2.7.0 + diff --git a/unmaintained/uboot-omap3_beagle/PKGBUILD b/unmaintained/uboot-omap3_beagle/PKGBUILD new file mode 100644 index 000000000..8d3d1846d --- /dev/null +++ b/unmaintained/uboot-omap3_beagle/PKGBUILD @@ -0,0 +1,45 @@ +# U-Boot: BeagleBoard and BeagleBoard-xM +# Maintainer: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgname=uboot-omap3_beagle +pkgver=2016.01 +pkgrel=1 +pkgdesc="U-Boot for BeagleBoard and BeagleBoard-xM" +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +license=('GPL') +replaces=('uboot-beagleboard-linux-libre' 'uboot-beagleboard-linux-libre-lts' + 'uboot-beagleboard-linux-libre-grsec' 'uboot-beagleboard-linux-libre-pck' + 'uboot-beagleboard') +conflicts=('uboot4extlinux-omap3_beagle' 'uboot4grub-omap3_beagle') +makedepends=('bc') +depends=('linux-libre') +source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" + '0001-parabola-arm-modifications.patch' + 'uEnv.txt') +md5sums=('7d4f65fd43d4d706f5c5650e020d899d' + '7922da50052c9ca5feb6f0356415d7eb' + 'd41d8cd98f00b204e9800998ecf8427e') + +prepare() { + cd u-boot-${pkgver} + patch -Np1 -i ../0001-parabola-arm-modifications.patch +} + +build() { + cd u-boot-${pkgver} + + unset LDFLAGS CFLAGS CXXFLAGS + + make distclean + make omap3_beagle_config + make +} + +package() { + cd u-boot-${pkgver} + mkdir -p "${pkgdir}"/boot + cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot +} diff --git a/unmaintained/uboot-omap3_beagle/uEnv.txt b/unmaintained/uboot-omap3_beagle/uEnv.txt new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/unmaintained/uboot-omap3_beagle/uEnv.txt diff --git a/unmaintained/uboot-omap4_panda/0001-parabola-arm-modifications.patch b/unmaintained/uboot-omap4_panda/0001-parabola-arm-modifications.patch new file mode 100644 index 000000000..f966c4e71 --- /dev/null +++ b/unmaintained/uboot-omap4_panda/0001-parabola-arm-modifications.patch @@ -0,0 +1,129 @@ +diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h +index 08130eb..8835cf8 100644 +--- a/include/configs/ti_omap4_common.h ++++ b/include/configs/ti_omap4_common.h +@@ -46,7 +46,6 @@ + * the timings to use or use pre-determined timings (based on using the + * dynamic method. Default to the static timing infomation. + */ +-#define CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS + #ifndef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS + #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION + #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS +@@ -79,6 +78,9 @@ + #define CONFIG_USB_TTY 1 + #define CONFIG_SYS_CONSOLE_IS_IN_ENV 1 + ++/* Parabola GNU/Linux-libre extras */ ++#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre" ++ + /* + * Environment setup + */ +@@ -89,23 +91,53 @@ + "fdtfile=undefined\0" \ + "bootpart=0:2\0" \ + "bootdir=/boot\0" \ +- "bootfile=zImage\0" \ ++ "fdtdir=/boot/dtbs/linux-libre\0" \ ++ "bootfile=vmlinuz-linux-libre\0" \ ++ "rdfile=initramfs-linux-libre.img\0" \ + "usbtty=cdc_acm\0" \ + "vram=16M\0" \ +- "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ +- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ +- "source ${loadaddr}\0" \ +- "loadbootenv=load mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ +- "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ +- "env import -t ${loadaddr} ${filesize}\0" \ +- "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ +- "loaduimage=load mmc ${mmcdev} ${loadaddr} uImage\0" \ +- "mmcboot=echo Booting from mmc${mmcdev} ...; " \ +- "run args_mmc; " \ +- "bootz ${loadaddr} - ${fdtaddr}\0" \ +- "uimageboot=echo Booting from mmc${mmcdev} ...; " \ +- "run args_mmc; " \ +- "bootm ${loadaddr}\0" \ ++ "optargs=\0" \ ++ "mmcargs=setenv bootargs console=${console} " \ ++ "vram=${vram} " \ ++ "root=${root} " \ ++ "${optargs}\0" \ ++ "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ ++ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \ ++ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ ++ "mmcboot=usb start;" \ ++ "for devtype in mmc usb; do " \ ++ "setenv devnum 0;" \ ++ "while ${devtype} dev ${devnum}; do " \ ++ "echo ${devtype} found on device ${devnum};" \ ++ "setenv bootpart ${devnum}:1;" \ ++ "part uuid ${devtype} ${bootpart} uuid;" \ ++ "setenv root PARTUUID=${uuid} rw rootwait;" \ ++ "echo Checking for: ${bootdir}/uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} ${bootdir}/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from ${bootdir}/uEnv.txt;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi;" \ ++ "if run loadimage; then " \ ++ "run mmcargs;" \ ++ "if run loadfdt; then " \ ++ "if run loadrd; then " \ ++ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ ++ "else " \ ++ "bootz ${loadaddr} - ${fdtaddr};" \ ++ "fi;" \ ++ "fi;" \ ++ "else " \ ++ "echo No kernel found;" \ ++ "fi;" \ ++ "setexpr devnum ${devnum} + 1;" \ ++ "done;" \ ++ "done;\0" \ + "findfdt="\ + "if test $board_name = sdp4430; then " \ + "setenv fdtfile omap4-sdp.dtb; fi; " \ +@@ -118,32 +150,11 @@ + "if test $board_name = duovero; then " \ + "setenv fdtfile omap4-duovero-parlor.dtb; fi;" \ + "if test $fdtfile = undefined; then " \ +- "echo WARNING: Could not determine device tree to use; fi; \0" \ +- "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ ++ "echo WARNING: Could not determine device tree to use; fi; \0" + + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ +- "mmc dev ${mmcdev}; if mmc rescan; then " \ +- "echo SD/MMC found on device ${mmcdev};" \ +- "if run loadbootscript; then " \ +- "run bootscript; " \ +- "else " \ +- "if run loadbootenv; then " \ +- "run importbootenv; " \ +- "fi;" \ +- "if test -n ${uenvcmd}; then " \ +- "echo Running uenvcmd ...;" \ +- "run uenvcmd;" \ +- "fi;" \ +- "fi;" \ +- "if run loadimage; then " \ +- "run loadfdt;" \ +- "run mmcboot; " \ +- "fi; " \ +- "if run loaduimage; then " \ +- "run uimageboot;" \ +- "fi; " \ +- "fi" ++ "run mmcboot" + + /* + * Defines for SPL +-- +2.6.4 + diff --git a/unmaintained/uboot-omap4_panda/PKGBUILD b/unmaintained/uboot-omap4_panda/PKGBUILD new file mode 100644 index 000000000..255c069d6 --- /dev/null +++ b/unmaintained/uboot-omap4_panda/PKGBUILD @@ -0,0 +1,47 @@ +# U-Boot: PandaBoard and PandaBoard ES +# Maintainer: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgname=uboot-omap4_panda +pkgver=2016.01 +pkgrel=1 +pkgdesc="U-Boot for PandaBoard and PandaBoard ES" +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +replaces=('uboot-pandaboard-linux-libre' 'uboot-pandaboard') +conflicts=('uboot4extlinux-omap4_panda' 'uboot4grub-omap4_panda') +makedepends=('bc') +depends=('linux-libre') +license=('GPL') +install=${pkgname}.install +backup=('boot/uEnv.txt') +source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" + '0001-parabola-arm-modifications.patch' + 'uEnv.txt') +md5sums=('7d4f65fd43d4d706f5c5650e020d899d' + 'e47c5f7b3bf0504ce36ce718eb982a77' + '86004660f2912861a040e335c9c0e85b') + +prepare() { + cd u-boot-${pkgver} + + patch -Np1 -i ../0001-parabola-arm-modifications.patch +} + +build() { + cd u-boot-${pkgver} + + unset LDFLAGS + + make distclean + make omap4_panda_config + make +} + +package() { + cd u-boot-${pkgver} + + mkdir -p "${pkgdir}"/boot + cp MLO u-boot.img "${srcdir}"/uEnv.txt "${pkgdir}"/boot +} diff --git a/unmaintained/uboot-omap4_panda/uEnv.txt b/unmaintained/uboot-omap4_panda/uEnv.txt new file mode 100644 index 000000000..55298e1a9 --- /dev/null +++ b/unmaintained/uboot-omap4_panda/uEnv.txt @@ -0,0 +1,2 @@ +# Uncomment and add any additional kernel parameters to optargs +#optargs= diff --git a/unmaintained/uboot-omap4_panda/uboot-omap4_panda.install b/unmaintained/uboot-omap4_panda/uboot-omap4_panda.install new file mode 100644 index 000000000..a394ae827 --- /dev/null +++ b/unmaintained/uboot-omap4_panda/uboot-omap4_panda.install @@ -0,0 +1,21 @@ +flash_uboot() { + echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0." + echo "Do this now? [y|N]" + read -r shouldwe + if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then + dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k + dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k + else + echo "You can do this later by running:" + echo "# dd if=/boot/MLO of=/dev/mmcblk0 count=1 seek=1 conv=notrunc bs=128k" + echo "# dd if=/boot/u-boot.img of=/dev/mmcblk0 count=2 seek=1 conv=notrunc bs=384k" + fi +} + +post_install() { + flash_uboot +} + +post_upgrade() { + flash_uboot +} diff --git a/unmaintained/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch b/unmaintained/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch new file mode 100644 index 000000000..30718c561 --- /dev/null +++ b/unmaintained/uboot-trimslice/0001-kernel-add-support-for-gcc-5.patch @@ -0,0 +1,97 @@ +From 5b07fc2c680ad4279a45d863108544020b4d74cd Mon Sep 17 00:00:00 2001 +From: Sasha Levin <sasha.levin@oracle.com> +Date: Mon, 13 Oct 2014 15:51:05 -0700 +Subject: [PATCH 2/6] kernel: add support for gcc 5 + +We're missing include/linux/compiler-gcc5.h which is required now +because gcc branched off to v5 in trunk. + +Just copy the relevant bits out of include/linux/compiler-gcc4.h, +no new code is added as of now. + +This fixes a build error when using gcc 5. + +Signed-off-by: Sasha Levin <sasha.levin@oracle.com> +Cc: <stable@vger.kernel.org> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +--- + include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + create mode 100644 include/linux/compiler-gcc5.h + +diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h +new file mode 100644 +index 0000000..cdd1cc2 +--- /dev/null ++++ b/include/linux/compiler-gcc5.h +@@ -0,0 +1,66 @@ ++#ifndef __LINUX_COMPILER_H ++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." ++#endif ++ ++#define __used __attribute__((__used__)) ++#define __must_check __attribute__((warn_unused_result)) ++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) ++ ++/* Mark functions as cold. gcc will assume any path leading to a call ++ to them will be unlikely. This means a lot of manual unlikely()s ++ are unnecessary now for any paths leading to the usual suspects ++ like BUG(), printk(), panic() etc. [but let's keep them for now for ++ older compilers] ++ ++ Early snapshots of gcc 4.3 don't support this and we can't detect this ++ in the preprocessor, but we can live with this because they're unreleased. ++ Maketime probing would be overkill here. ++ ++ gcc also has a __attribute__((__hot__)) to move hot functions into ++ a special section, but I don't see any sense in this right now in ++ the kernel context */ ++#define __cold __attribute__((__cold__)) ++ ++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) ++ ++#ifndef __CHECKER__ ++# define __compiletime_warning(message) __attribute__((warning(message))) ++# define __compiletime_error(message) __attribute__((error(message))) ++#endif /* __CHECKER__ */ ++ ++/* ++ * Mark a position in code as unreachable. This can be used to ++ * suppress control flow warnings after asm blocks that transfer ++ * control elsewhere. ++ * ++ * Early snapshots of gcc 4.5 don't support this and we can't detect ++ * this in the preprocessor, but we can live with this because they're ++ * unreleased. Really, we need to have autoconf for the kernel. ++ */ ++#define unreachable() __builtin_unreachable() ++ ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) ++ ++/* ++ * Tell the optimizer that something else uses this function or variable. ++ */ ++#define __visible __attribute__((externally_visible)) ++ ++/* ++ * GCC 'asm goto' miscompiles certain code sequences: ++ * ++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 ++ * ++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. ++ * Fixed in GCC 4.8.2 and later versions. ++ * ++ * (asm goto is automatically volatile - the naming reflects this.) ++ */ ++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) ++ ++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP ++#define __HAVE_BUILTIN_BSWAP32__ ++#define __HAVE_BUILTIN_BSWAP64__ ++#define __HAVE_BUILTIN_BSWAP16__ ++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ +-- +2.4.4 + diff --git a/unmaintained/uboot-trimslice/PKGBUILD b/unmaintained/uboot-trimslice/PKGBUILD new file mode 100644 index 000000000..bcd47f77e --- /dev/null +++ b/unmaintained/uboot-trimslice/PKGBUILD @@ -0,0 +1,52 @@ +# U-Boot: TrimSlice +# Maintainer: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgname=uboot-trimslice +pkgver=2014.10 +pkgrel=1.parabola1 +pkgdesc="U-Boot for TrimSlice" +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +makedepends=('cbootimage' 'dtc' 'uboot-tools') +depends=('linux-libre') +replaces=('uboot-trimslice-linux-libre') +conflicts=('uboot4extlinux-trimslice' 'uboot4grub-trimslice') +license=('GPL') +source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" + "git+https://github.com/NVIDIA/cbootimage-configs.git" + "boot.txt" + "0001-kernel-add-support-for-gcc-5.patch") +md5sums=('3ddcaee2f05b7c464778112ec83664b5' + 'SKIP' + '9374fbadb4b4c1298ea050ad4ea79f46' + '721a46867e189d8dedc6b6f86a536a34') + +prepare() { + cd u-boot-${pkgver} + + patch -Np1 -i ../0001-kernel-add-support-for-gcc-5.patch +} + +build() { + cd u-boot-${pkgver} + + unset LDFLAGS + + make distclean + make trimslice_config + make +} + +package() { + mkdir -p "${pkgdir}"/boot + mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "TrimSlice" -d boot.txt "${pkgdir}"/boot/boot.scr + cp boot.txt "${pkgdir}"/boot + + cd cbootimage-configs/tegra20/compulab/trimslice + ln -s ${srcdir}/u-boot-${pkgver}/u-boot-dtb-tegra.bin u-boot.bin + ./build.sh + + cp trimslice-mmc.img trimslice-spi.img "${pkgdir}"/boot +} diff --git a/unmaintained/uboot-trimslice/boot.txt b/unmaintained/uboot-trimslice/boot.txt new file mode 100644 index 000000000..100d4b6de --- /dev/null +++ b/unmaintained/uboot-trimslice/boot.txt @@ -0,0 +1,21 @@ +if test "${devtype}" = "mmc"; then + if test ${devnum} -eq 1; then + setenv root /dev/mmcblk0p1; + else + if mmc dev 1; then + setenv root /dev/mmcblk1p1; + mmc dev 0; + else + setenv root /dev/mmcblk0p1; + fi; + fi; +else + setenv root /dev/sda1; +fi + +setenv bootargs "root=${root} rw rootwait console=tty1 console=ttyS0,115200n8 mem=384M@0M mem=512M@512M nvmem=128M@384M vmalloc=248M video=tegrafb" + +load ${devtype} ${devnum}:${bootpart} ${loadaddr} /boot/vmlinuz-linux-libre +load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/linux-libre/tegra20-trimslice.dtb + +bootz ${loadaddr} - ${fdt_addr_r} diff --git a/unmaintained/uboot-udoo/0001-parabola-arm-modifications.patch b/unmaintained/uboot-udoo/0001-parabola-arm-modifications.patch new file mode 100644 index 000000000..7fd54e8f3 --- /dev/null +++ b/unmaintained/uboot-udoo/0001-parabola-arm-modifications.patch @@ -0,0 +1,391 @@ +diff --git a/board/udoo/1066mhz_4x256mx16_dl.cfg b/board/udoo/1066mhz_4x256mx16_dl.cfg +new file mode 100644 +index 0000000..e37c9f9 +--- /dev/null ++++ b/board/udoo/1066mhz_4x256mx16_dl.cfg +@@ -0,0 +1,58 @@ ++/* ++ * Copyright (C) 2013 Seco USA Inc ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ */ ++ ++ ++DATA 4, MX6_MMDC_P0_MDPDC, 0x0002002D ++DATA 4, MX6_MMDC_P0_MDOTC, 0x00333040 ++ ++DATA 4, MX6_MMDC_P0_MDCFG0, 0x3F4352F3 ++DATA 4, MX6_MMDC_P0_MDCFG1, 0xB66D8B63 ++DATA 4, MX6_MMDC_P0_MDCFG2, 0x01FF00DB ++ ++DATA 4, MX6_MMDC_P0_MDMISC, 0x00001740 ++DATA 4, MX6_MMDC_P0_MDSCR, 0x00008000 ++DATA 4, MX6_MMDC_P0_MDRWD, 0x000026D2 ++ ++ ++DATA 4, MX6_MMDC_P0_MDOR, 0x00431023 ++DATA 4, MX6_MMDC_P0_MDASP, 0x00000027 ++DATA 4, MX6_MMDC_P0_MDCTL, 0x831A0000 ++ ++DATA 4, MX6_MMDC_P0_MDSCR, 0x02008032 ++DATA 4, MX6_MMDC_P0_MDSCR, 0x00008033 ++DATA 4, MX6_MMDC_P0_MDSCR, 0x00048031 ++DATA 4, MX6_MMDC_P0_MDSCR, 0x05208030 ++DATA 4, MX6_MMDC_P0_MDSCR, 0x04008040 ++ ++DATA 4, MX6_MMDC_P0_MPZQHWCTRL, 0xa1390003 ++DATA 4, MX6_MMDC_P1_MPZQHWCTRL, 0xa1390003 ++ ++DATA 4, MX6_MMDC_P0_MDREF, 0x00007800 ++ ++DATA 4, MX6_MMDC_P0_MPODTCTRL, 0x00022227 ++DATA 4, MX6_MMDC_P1_MPODTCTRL, 0x00022227 ++ ++DATA 4, MX6_MMDC_P0_MPDGCTRL0, 0x425C0251 ++DATA 4, MX6_MMDC_P0_MPDGCTRL1, 0x021B021E ++DATA 4, MX6_MMDC_P1_MPDGCTRL0, 0x021B021E ++DATA 4, MX6_MMDC_P1_MPDGCTRL1, 0x01730200 ++ ++DATA 4, MX6_MMDC_P0_MPRDDLCTL, 0x45474C45 ++DATA 4, MX6_MMDC_P1_MPRDDLCTL, 0x44464744 ++DATA 4, MX6_MMDC_P0_MPWRDLCTL, 0x3F3F3336 ++DATA 4, MX6_MMDC_P1_MPWRDLCTL, 0x32383630 ++ ++DATA 4, MX6_MMDC_P0_MPWLDECTRL0, 0x002F0038 ++DATA 4, MX6_MMDC_P0_MPWLDECTRL1, 0x001F001F ++DATA 4, MX6_MMDC_P1_MPWLDECTRL0, 0x001F001F ++DATA 4, MX6_MMDC_P1_MPWLDECTRL1, 0x001F001F ++ ++DATA 4, MX6_MMDC_P0_MPMUR0, 0x00000000 ++DATA 4, MX6_MMDC_P1_MPMUR0, 0x00000000 ++ ++DATA 4, MX6_MMDC_P0_MDPDC, 0x0002556D ++DATA 4, MX6_MMDC_P0_MAPSR, 0x00011006 ++DATA 4, MX6_MMDC_P0_MDSCR, 0x00000000 +diff --git a/board/udoo/ddr-setup_dl.cfg b/board/udoo/ddr-setup_dl.cfg +new file mode 100644 +index 0000000..487570e +--- /dev/null ++++ b/board/udoo/ddr-setup_dl.cfg +@@ -0,0 +1,84 @@ ++/* ++ * Copyright (C) 2013 Seco USA Inc ++ * ++ * 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 ++ */ ++ ++/* ++ * DDR3 settings ++ * MX6Q ddr is limited to 1066 Mhz currently 1056 MHz(528 MHz clock), ++ * memory bus width: 64 bits x16/x32/x64 ++ * MX6DL ddr is limited to 800 MHz(400 MHz clock) ++ * memory bus width: 64 bits x16/x32/x64 ++ * MX6SOLO ddr is limited to 800 MHz(400 MHz clock) ++ * memory bus width: 32 bits x16/x32 ++ */ ++DATA 4, MX6_IOM_DRAM_SDQS0, 0x00000028 ++DATA 4, MX6_IOM_DRAM_SDQS1, 0x00000028 ++DATA 4, MX6_IOM_DRAM_SDQS2, 0x00000028 ++DATA 4, MX6_IOM_DRAM_SDQS3, 0x00000028 ++DATA 4, MX6_IOM_DRAM_SDQS4, 0x00000028 ++DATA 4, MX6_IOM_DRAM_SDQS5, 0x00000028 ++DATA 4, MX6_IOM_DRAM_SDQS6, 0x00000028 ++DATA 4, MX6_IOM_DRAM_SDQS7, 0x00000028 ++ ++DATA 4, MX6_IOM_GRP_B0DS, 0x00000028 ++DATA 4, MX6_IOM_GRP_B1DS, 0x00000028 ++DATA 4, MX6_IOM_GRP_B2DS, 0x00000028 ++DATA 4, MX6_IOM_GRP_B3DS, 0x00000028 ++DATA 4, MX6_IOM_GRP_B4DS, 0x00000028 ++DATA 4, MX6_IOM_GRP_B5DS, 0x00000028 ++DATA 4, MX6_IOM_GRP_B6DS, 0x00000028 ++DATA 4, MX6_IOM_GRP_B7DS, 0x00000028 ++DATA 4, MX6_IOM_GRP_ADDDS, 0x00000028 ++ ++DATA 4, MX6_IOM_GRP_CTLDS, 0x00000028 ++ ++DATA 4, MX6_IOM_DRAM_DQM0, 0x00000028 ++DATA 4, MX6_IOM_DRAM_DQM1, 0x00000028 ++DATA 4, MX6_IOM_DRAM_DQM2, 0x00000028 ++DATA 4, MX6_IOM_DRAM_DQM3, 0x00000028 ++DATA 4, MX6_IOM_DRAM_DQM4, 0x00000028 ++DATA 4, MX6_IOM_DRAM_DQM5, 0x00000028 ++DATA 4, MX6_IOM_DRAM_DQM6, 0x00000028 ++DATA 4, MX6_IOM_DRAM_DQM7, 0x00000028 ++ ++DATA 4, MX6_IOM_DRAM_CAS, 0x00000028 ++DATA 4, MX6_IOM_DRAM_RAS, 0x00000028 ++DATA 4, MX6_IOM_DRAM_SDCLK_0, 0x00000028 ++DATA 4, MX6_IOM_DRAM_SDCLK_1, 0x00000028 ++ ++DATA 4, MX6_IOM_DRAM_RESET, 0x00000028 ++ ++DATA 4, MX6_IOM_DRAM_SDODT0, 0x00000028 ++DATA 4, MX6_IOM_DRAM_SDODT1, 0x00000028 ++ ++/* (differential input) */ ++DATA 4, MX6_IOM_DDRMODE_CTL, 0x00020000 ++/* (differential input) */ ++DATA 4, MX6_IOM_GRP_DDRMODE, 0x00020000 ++/* disable ddr pullups */ ++DATA 4, MX6_IOM_GRP_DDRPKE, 0x00000000 ++DATA 4, MX6_IOM_DRAM_SDBA2, 0x00000000 ++/* 40 Ohm drive strength for cs0/1,sdba2,cke0/1,sdwe */ ++DATA 4, MX6_IOM_GRP_DDR_TYPE, 0x000C0000 ++ ++/* Read data DQ Byte0-3 delay */ ++DATA 4, MX6_MMDC_P0_MPRDDQBY0DL, 0x33333333 ++DATA 4, MX6_MMDC_P0_MPRDDQBY1DL, 0x33333333 ++DATA 4, MX6_MMDC_P0_MPRDDQBY2DL, 0x33333333 ++DATA 4, MX6_MMDC_P0_MPRDDQBY3DL, 0x33333333 ++DATA 4, MX6_MMDC_P1_MPRDDQBY0DL, 0x33333333 ++DATA 4, MX6_MMDC_P1_MPRDDQBY1DL, 0x33333333 ++DATA 4, MX6_MMDC_P1_MPRDDQBY2DL, 0x33333333 ++DATA 4, MX6_MMDC_P1_MPRDDQBY3DL, 0x33333333 +diff --git a/board/udoo/udoo-dl.cfg b/board/udoo/udoo-dl.cfg +new file mode 100644 +index 0000000..46953c1 +--- /dev/null ++++ b/board/udoo/udoo-dl.cfg +@@ -0,0 +1,29 @@ ++/* ++ * Copyright (C) 2013 Boundary Devices ++ * ++ * SPDX-License-Identifier: GPL-2.0+ ++ * ++ * Refer doc/README.imximage for more details about how-to configure ++ * and create imximage boot image ++ * ++ * The syntax is taken as close as possible with the kwbimage ++ */ ++ ++/* image version */ ++IMAGE_VERSION 2 ++ ++/* ++ * Boot Device : one of ++ * spi, sd (the board has no nand neither onenand) ++ */ ++BOOT_FROM sd ++ ++#define __ASSEMBLY__ ++#include <config.h> ++#include "asm/arch/mx6-ddr.h" ++#include "asm/arch/iomux.h" ++#include "asm/arch/crm_regs.h" ++ ++#include "ddr-setup_dl.cfg" ++#include "1066mhz_4x256mx16_dl.cfg" ++#include "clocks.cfg" +diff --git a/configs/udoo_dl_defconfig b/configs/udoo_dl_defconfig +new file mode 100644 +index 0000000..5dc9016 +--- /dev/null ++++ b/configs/udoo_dl_defconfig +@@ -0,0 +1,3 @@ ++CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/udoo/udoo-dl.cfg,MX6DL,DDR_MB=1024" ++CONFIG_ARM=y ++CONFIG_TARGET_UDOO=y +diff --git a/include/configs/udoo.h b/include/configs/udoo.h +index 700e9c1..7fdce0f 100644 +--- a/include/configs/udoo.h ++++ b/include/configs/udoo.h +@@ -78,7 +78,7 @@ + #define CONFIG_CMD_BMODE + #define CONFIG_CMD_SETEXPR + +-#define CONFIG_BOOTDELAY 3 ++#define CONFIG_BOOTDELAY 1 + + #define CONFIG_SYS_MEMTEST_START 0x10000000 + #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) +@@ -96,60 +96,97 @@ + #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 + ++#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre" ++ ++#if defined(CONFIG_MX6DL) || defined(CONFIG_MX6S) ++#define CONFIG_DEFAULT_FDT_FILE "imx6dl-udoo.dtb" ++#elif defined(CONFIG_MX6Q) + #define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb" ++#endif + + #define CONFIG_EXTRA_ENV_SETTINGS \ +- "script=boot.scr\0" \ +- "image=zImage\0" \ +- "console=ttymxc1\0" \ ++ "bootfile=vmlinuz-linux-libre\0" \ ++ "bootdir=/boot\0" \ ++ "console=ttymxc1,115200\0" \ + "splashpos=m,m\0" \ + "fdt_high=0xffffffff\0" \ ++ "rdaddr=0x12A00000\0" \ ++ "rdfile=initramfs-linux-libre.img\0" \ + "initrd_high=0xffffffff\0" \ +- "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \ +- "fdt_addr=0x18000000\0" \ +- "boot_fdt=try\0" \ ++ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ ++ "fdtdir=/boot/dtbs/linux-libre\0" \ ++ "fdtaddr=0x18000000\0" \ + "ip_dyn=yes\0" \ ++ "optargs=\0" \ ++ "video=\0" \ + "mmcdev=0\0" \ +- "mmcpart=1\0" \ +- "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ +- "update_sd_firmware_filename=u-boot.imx\0" \ +- "update_sd_firmware=" \ +- "if test ${ip_dyn} = yes; then " \ +- "setenv get_cmd dhcp; " \ ++ "mmcroot=/dev/mmcblk0p1 rw rootwait\0" \ ++ "mmcargs=setenv bootargs console=${console} " \ ++ "${optargs} " \ ++ "root=${mmcroot} " \ ++ "video=${video}\0" \ ++ "videoargs=" \ ++ "setenv nextcon 0; " \ ++ "if hdmidet; then " \ ++ "setenv bootargs ${bootargs} " \ ++ "video=mxcfb${nextcon}:dev=hdmi,1280x720M@60," \ ++ "if=RGB24; " \ ++ "setenv fbmem fbmem=28M; " \ ++ "setexpr nextcon ${nextcon} + 1; " \ + "else " \ +- "setenv get_cmd tftp; " \ ++ "echo - no HDMI monitor;" \ + "fi; " \ +- "if mmc dev ${mmcdev}; then " \ +- "if ${get_cmd} ${update_sd_firmware_filename}; then " \ +- "setexpr fw_sz ${filesize} / 0x200; " \ +- "setexpr fw_sz ${fw_sz} + 1; " \ +- "mmc write ${loadaddr} 0x2 ${fw_sz}; " \ +- "fi; " \ +- "fi\0" \ +- "mmcargs=setenv bootargs console=${console},${baudrate} " \ +- "root=${mmcroot}\0" \ +- "loadbootscript=" \ +- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ +- "bootscript=echo Running bootscript from mmc ...; " \ +- "source\0" \ +- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ +- "mmcboot=echo Booting from mmc ...; " \ +- "run mmcargs; " \ +- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if run loadfdt; then " \ +- "bootz ${loadaddr} - ${fdt_addr}; " \ ++ "i2c dev 1; " \ ++ "if i2c probe 0x10; then " \ ++ "setenv bootargs ${bootargs} " \ ++ "video=mxcfb${nextcon}:dev=lcd,800x480@60," \ ++ "if=RGB666; " \ ++ "if test 0 -eq ${nextcon}; then " \ ++ "setenv fbmem fbmem=10M; " \ + "else " \ +- "if test ${boot_fdt} = try; then " \ +- "bootz; " \ +- "else " \ +- "echo WARN: Cannot load the DT; " \ +- "fi; " \ ++ "setenv fbmem ${fbmem},10M; " \ + "fi; " \ ++ "setexpr nextcon ${nextcon} + 1; " \ + "else " \ +- "bootz; " \ ++ "echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \ ++ "fi; " \ ++ "setenv bootargs ${bootargs} ${fbmem}\0" \ ++ "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ ++ "loadrd=load mmc ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \ ++ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load mmc ${bootpart} ${fdtaddr} ${fdtdir}/${fdtfile}\0" \ ++ "mmcboot=mmc dev ${mmcdev}; " \ ++ "if mmc rescan; then " \ ++ "echo SD/MMC found on device ${mmcdev};" \ ++ "setenv bootpart ${mmcdev}:1; " \ ++ "echo Checking for: ${bootdir}/uEnv.txt ...;" \ ++ "if test -e mmc ${bootpart} ${bootdir}/uEnv.txt; then " \ ++ "load mmc ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from ${bootdir}/uEnv.txt;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi; " \ ++ "if run loadimage; then " \ ++ "if run loadfdt; then " \ ++ "run mmcargs;" \ ++ "if run loadrd; then " \ ++ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdtaddr};" \ ++ "else " \ ++ "bootz ${loadaddr} - ${fdtaddr};" \ ++ "fi;" \ ++ "else " \ ++ "echo Kernel found, but no device tree found;" \ ++ "fi;" \ ++ "else " \ ++ "echo No kernel found;" \ ++ "fi;" \ + "fi;\0" \ + "netargs=setenv bootargs console=${console},${baudrate} " \ + "root=/dev/nfs " \ +@@ -161,10 +198,10 @@ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ +- "${get_cmd} ${image}; " \ ++ "${get_cmd} ${bootfile}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ +- "bootz ${loadaddr} - ${fdt_addr}; " \ ++ "if ${get_cmd} ${fdtaddr} ${fdtfile}; then " \ ++ "bootz ${loadaddr} - ${fdtaddr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootz; " \ +@@ -177,16 +214,7 @@ + "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" ++ "run mmcboot;" + + /* Miscellaneous configurable options */ + #define CONFIG_SYS_LONGHELP +@@ -228,6 +256,7 @@ + + #define CONFIG_OF_LIBFDT + #define CONFIG_CMD_BOOTZ ++#define CONFIG_SUPPORT_RAW_INITRD + + #ifndef CONFIG_SYS_DCACHE_OFF + #define CONFIG_CMD_CACHE +-- +2.2.1 + diff --git a/unmaintained/uboot-udoo/0002-kernel-add-support-for-gcc-5.patch b/unmaintained/uboot-udoo/0002-kernel-add-support-for-gcc-5.patch new file mode 100644 index 000000000..30718c561 --- /dev/null +++ b/unmaintained/uboot-udoo/0002-kernel-add-support-for-gcc-5.patch @@ -0,0 +1,97 @@ +From 5b07fc2c680ad4279a45d863108544020b4d74cd Mon Sep 17 00:00:00 2001 +From: Sasha Levin <sasha.levin@oracle.com> +Date: Mon, 13 Oct 2014 15:51:05 -0700 +Subject: [PATCH 2/6] kernel: add support for gcc 5 + +We're missing include/linux/compiler-gcc5.h which is required now +because gcc branched off to v5 in trunk. + +Just copy the relevant bits out of include/linux/compiler-gcc4.h, +no new code is added as of now. + +This fixes a build error when using gcc 5. + +Signed-off-by: Sasha Levin <sasha.levin@oracle.com> +Cc: <stable@vger.kernel.org> +Signed-off-by: Andrew Morton <akpm@linux-foundation.org> +Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +--- + include/linux/compiler-gcc5.h | 66 +++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 66 insertions(+) + create mode 100644 include/linux/compiler-gcc5.h + +diff --git a/include/linux/compiler-gcc5.h b/include/linux/compiler-gcc5.h +new file mode 100644 +index 0000000..cdd1cc2 +--- /dev/null ++++ b/include/linux/compiler-gcc5.h +@@ -0,0 +1,66 @@ ++#ifndef __LINUX_COMPILER_H ++#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead." ++#endif ++ ++#define __used __attribute__((__used__)) ++#define __must_check __attribute__((warn_unused_result)) ++#define __compiler_offsetof(a, b) __builtin_offsetof(a, b) ++ ++/* Mark functions as cold. gcc will assume any path leading to a call ++ to them will be unlikely. This means a lot of manual unlikely()s ++ are unnecessary now for any paths leading to the usual suspects ++ like BUG(), printk(), panic() etc. [but let's keep them for now for ++ older compilers] ++ ++ Early snapshots of gcc 4.3 don't support this and we can't detect this ++ in the preprocessor, but we can live with this because they're unreleased. ++ Maketime probing would be overkill here. ++ ++ gcc also has a __attribute__((__hot__)) to move hot functions into ++ a special section, but I don't see any sense in this right now in ++ the kernel context */ ++#define __cold __attribute__((__cold__)) ++ ++#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) ++ ++#ifndef __CHECKER__ ++# define __compiletime_warning(message) __attribute__((warning(message))) ++# define __compiletime_error(message) __attribute__((error(message))) ++#endif /* __CHECKER__ */ ++ ++/* ++ * Mark a position in code as unreachable. This can be used to ++ * suppress control flow warnings after asm blocks that transfer ++ * control elsewhere. ++ * ++ * Early snapshots of gcc 4.5 don't support this and we can't detect ++ * this in the preprocessor, but we can live with this because they're ++ * unreleased. Really, we need to have autoconf for the kernel. ++ */ ++#define unreachable() __builtin_unreachable() ++ ++/* Mark a function definition as prohibited from being cloned. */ ++#define __noclone __attribute__((__noclone__)) ++ ++/* ++ * Tell the optimizer that something else uses this function or variable. ++ */ ++#define __visible __attribute__((externally_visible)) ++ ++/* ++ * GCC 'asm goto' miscompiles certain code sequences: ++ * ++ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670 ++ * ++ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek. ++ * Fixed in GCC 4.8.2 and later versions. ++ * ++ * (asm goto is automatically volatile - the naming reflects this.) ++ */ ++#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0) ++ ++#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP ++#define __HAVE_BUILTIN_BSWAP32__ ++#define __HAVE_BUILTIN_BSWAP64__ ++#define __HAVE_BUILTIN_BSWAP16__ ++#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */ +-- +2.4.4 + diff --git a/unmaintained/uboot-udoo/PKGBUILD b/unmaintained/uboot-udoo/PKGBUILD new file mode 100644 index 000000000..b7e10572a --- /dev/null +++ b/unmaintained/uboot-udoo/PKGBUILD @@ -0,0 +1,65 @@ +# U-Boot: UDOO +# Maintainer: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgbase=uboot-udoo +pkgname=('uboot-udoo_dl' 'uboot-udoo_quad') +pkgver=2015.01 +pkgrel=1 +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +license=('GPL') +makedepends=('bc') +depends=('linux-libre') +source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" + '0001-parabola-arm-modifications.patch' + '0002-kernel-add-support-for-gcc-5.patch') +md5sums=('7f08dc9e98a71652bd6968888ed6ec95' + 'f5e3488e5f2e0646f7e2965c8d5c52d5' + '721a46867e189d8dedc6b6f86a536a34') + +prepare() { + cd u-boot-${pkgver} + + patch -Np1 -i ../0001-parabola-arm-modifications.patch + patch -Np1 -i ../0002-kernel-add-support-for-gcc-5.patch +} + +build() { + cd u-boot-${pkgver} + + unset CFLAGS CXXFLAGS LDFLAGS + + mkdir bins + for i in dl quad; do + make distclean + make udoo_${i}_config + make + mv u-boot.imx bins/u-boot-${i}.imx + done +} + +package_uboot-udoo_dl() { + pkgdesc="U-Boot for UDOO Dual" + replaces=('uboot-udoo-dual-linux-libre' 'uboot-udoo-dual-linux-libre-grsec' + 'uboot-udoo-dual') + conflicts=('uboot-udoo' 'uboot4extlinux-udoo' 'uboot4grub-udoo') + provides=('uboot-udoo') + install=${pkgbase}.install + + mkdir -p "${pkgdir}"/boot + cp u-boot-${pkgver}/bins/u-boot-dl.imx "${pkgdir}"/boot/u-boot.imx +} + +package_uboot-udoo_quad() { + pkgdesc="U-Boot for UDOO Quad" + replaces=('uboot-udoo-quad-linux-libre' 'uboot-udoo-quad-linux-libre-grsec' + 'uboot-udoo-quad') + conflicts=('uboot-udoo' 'uboot4extlinux-udoo' 'uboot4grub-udoo') + provides=('uboot-udoo') + install=${pkgbase}.install + + mkdir -p "${pkgdir}"/boot + cp u-boot-${pkgver}/bins/u-boot-quad.imx "${pkgdir}"/boot/u-boot.imx +} diff --git a/unmaintained/uboot-udoo/uboot-udoo.install b/unmaintained/uboot-udoo/uboot-udoo.install new file mode 100644 index 000000000..c74dc9766 --- /dev/null +++ b/unmaintained/uboot-udoo/uboot-udoo.install @@ -0,0 +1,23 @@ +flash_uboot() { + echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0." + echo "Do you want to do this now? [y|N]" + read -r shouldwe + if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then + dd if=/boot/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2 + sync + else + echo "You can do this later by running:" + echo "# dd if=/boot/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2" + fi +} + +## arg 1: the new package version +post_install() { + flash_uboot +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + flash_uboot +} diff --git a/unmaintained/uboot-usbarmory/0001-parabola-arm-modifications.patch b/unmaintained/uboot-usbarmory/0001-parabola-arm-modifications.patch new file mode 100644 index 000000000..9b14cabec --- /dev/null +++ b/unmaintained/uboot-usbarmory/0001-parabola-arm-modifications.patch @@ -0,0 +1,28 @@ +diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h +index d8165cc..377322b 100644 +--- a/include/config_distro_defaults.h ++++ b/include/config_distro_defaults.h +@@ -68,4 +68,7 @@ + #define CONFIG_SUPPORT_RAW_INITRD + #define CONFIG_SYS_HUSH_PARSER + ++#define CONFIG_CMD_PART ++#define CONFIG_PARTITION_UUIDS ++ + #endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */ +diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h +index 714e3e2..6be57dc 100644 +--- a/include/configs/usbarmory.h ++++ b/include/configs/usbarmory.h +@@ -23,6 +23,8 @@ + + #include <config_distro_defaults.h> + ++#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre" ++ + /* U-Boot commands */ + #define CONFIG_CMD_MEMTEST + +-- +2.6.1 + diff --git a/unmaintained/uboot-usbarmory/PKGBUILD b/unmaintained/uboot-usbarmory/PKGBUILD new file mode 100644 index 000000000..e127af246 --- /dev/null +++ b/unmaintained/uboot-usbarmory/PKGBUILD @@ -0,0 +1,53 @@ +# U-Boot: Inverse Path USB Armory +# Maintainer: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgname=uboot-usbarmory +pkgver=2016.01 +pkgrel=1.parabola1 +pkgdesc="U-Boot for USB Armory" +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +license=('GPL') +makedepends=('bc') +depends=('linux-libre') +replaces=('uboot-usbarmory-linux-libre') +conflicts=('uboot4extlinux-usbarmory' 'uboot4grub-usbarmory') +install=${pkgname}.install +backup=(boot/boot.txt boot/boot.scr) +source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" + '0001-parabola-arm-modifications.patch' + 'boot.txt' + 'mkscr') +md5sums=('7d4f65fd43d4d706f5c5650e020d899d' + '15bacb3ff7c9bfb350e7e43f081bd9b3' + 'eb83db44c372a6ff3349e026083f15f9' + '021623a04afd29ac3f368977140cfbfd') + +prepare() { + cd u-boot-${pkgver} + + patch -Np1 -i ../0001-parabola-arm-modifications.patch +} + +build() { + cd u-boot-${pkgver} + + unset CFLAGS CXXFLAGS LDFLAGS + + make distclean + make usbarmory_config + make +} + +package() { + cd u-boot-${pkgver} + + install -d "${pkgdir}"/boot + install -Dm644 u-boot.imx "${pkgdir}"/boot + + install -Dm644 ../boot.txt "${pkgdir}"/boot/boot.txt + tools/mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ../boot.txt "${pkgdir}"/boot/boot.scr + install -Dm755 ../mkscr "${pkgdir}"/boot/mkscr +} diff --git a/unmaintained/uboot-usbarmory/boot.txt b/unmaintained/uboot-usbarmory/boot.txt new file mode 100644 index 000000000..2454291f8 --- /dev/null +++ b/unmaintained/uboot-usbarmory/boot.txt @@ -0,0 +1,12 @@ +part uuid ${devtype} ${devnum}:${bootpart} uuid +setenv bootargs console=ttyGS0,115200 console=${console} root=PARTUUID=${uuid} rw rootwait + +if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/vmlinuz-linux-libre; then + if load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/${fdtfile}; then + if load ${devtype} ${devnum}:${bootpart} ${ramdisk_addr_r} /boot/initramfs-linux-libre.img; then + bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r}; + else + bootz ${kernel_addr_r} - ${fdt_addr_r}; + fi; + fi; +fi diff --git a/unmaintained/uboot-usbarmory/mkscr b/unmaintained/uboot-usbarmory/mkscr new file mode 100755 index 000000000..272b6a7a5 --- /dev/null +++ b/unmaintained/uboot-usbarmory/mkscr @@ -0,0 +1,9 @@ +#!/bin/bash + +if [[ ! -x /usr/bin/mkimage ]]; then + echo "mkimage not found. Please install uboot-tools:" + echo " pacman -S uboot-tools" + exit 1 +fi + +mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d boot.txt boot.scr diff --git a/unmaintained/uboot-usbarmory/uboot-usbarmory.install b/unmaintained/uboot-usbarmory/uboot-usbarmory.install new file mode 100644 index 000000000..6c0ddcf9e --- /dev/null +++ b/unmaintained/uboot-usbarmory/uboot-usbarmory.install @@ -0,0 +1,22 @@ +flash_uboot() { + echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0." + echo "Do this now? [y|N]" + read -r shouldwe + if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then + dd if=/boot/uboot-usbarmory-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2 conv=fsync + else + echo "You can do this later by running:" + echo "# dd if=/boot/uboot-usbarmory-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2 conv=fsync" + fi +} + +## arg 1: the new package version +post_install() { + flash_uboot +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + flash_uboot +} diff --git a/unmaintained/uboot-wandboard/0001-parabola-arm-modifications.patch b/unmaintained/uboot-wandboard/0001-parabola-arm-modifications.patch new file mode 100644 index 000000000..cb6a94e19 --- /dev/null +++ b/unmaintained/uboot-wandboard/0001-parabola-arm-modifications.patch @@ -0,0 +1,151 @@ +diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h +index ef4cb68..254458d 100644 +--- a/include/configs/mx6_common.h ++++ b/include/configs/mx6_common.h +@@ -68,7 +68,7 @@ + #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + + #ifndef CONFIG_BOOTDELAY +-#define CONFIG_BOOTDELAY 3 ++#define CONFIG_BOOTDELAY 1 + #endif + + /* allow to overwrite serial and ethaddr */ +@@ -82,6 +82,8 @@ + #define CONFIG_SUPPORT_RAW_INITRD + #define CONFIG_CMD_FS_GENERIC + #define CONFIG_DOS_PARTITION ++#define CONFIG_CMD_PART ++#define CONFIG_PARTITION_UUIDS + #define CONFIG_CMD_EXT2 + #define CONFIG_CMD_EXT4 + #define CONFIG_CMD_EXT4_WRITE +diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h +index 6e8aec2..a4963fa 100644 +--- a/include/configs/wandboard.h ++++ b/include/configs/wandboard.h +@@ -86,19 +86,26 @@ + #define CONFIG_IMX_HDMI + #define CONFIG_IMX_VIDEO_SKIP + ++#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre" ++ + #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + #define CONFIG_EXTRA_ENV_SETTINGS \ + "script=boot.scr\0" \ +- "image=zImage\0" \ ++ "image=vmlinuz-linux-libre\0" \ ++ "bootdir=/boot\0" \ + "console=ttymxc0\0" \ + "splashpos=m,m\0" \ + "fdtfile=undefined\0" \ ++ "fdtdir=/boot/dtbs/linux-libre\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + "fdt_addr=0x18000000\0" \ ++ "rdaddr=0x12A00000\0" \ ++ "rdfile=initramfs-linux-libre.img\0" \ + "boot_fdt=try\0" \ ++ "optargs=\0" \ + "ip_dyn=yes\0" \ +- "mmcdev=" __stringify(CONFIG_SYS_MMC_ENV_DEV) "\0" \ ++ "mmcdev=0\0" \ + "mmcpart=1\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "update_sd_firmware_filename=u-boot.imx\0" \ +@@ -116,7 +123,9 @@ + "fi; " \ + "fi\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} " \ +- "root=${mmcroot}; run videoargs\0" \ ++ "${optargs} " \ ++ "root=${root} " \ ++ "video=${video}\0" \ + "videoargs=" \ + "setenv nextcon 0; " \ + "if hdmidet; then " \ +@@ -143,27 +152,43 @@ + "echo '- no FWBADAPT-7WVGA-LCD-F07A-0102 display';" \ + "fi; " \ + "setenv bootargs ${bootargs} ${fbmem}\0" \ +- "loadbootscript=" \ +- "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ +- "bootscript=echo Running bootscript from mmc ...; " \ +- "source\0" \ +- "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ +- "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdtfile}\0" \ +- "mmcboot=echo Booting from mmc ...; " \ +- "run mmcargs; " \ +- "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ +- "if run loadfdt; then " \ +- "bootz ${loadaddr} - ${fdt_addr}; " \ +- "else " \ +- "if test ${boot_fdt} = try; then " \ +- "bootz; " \ ++ "loadimage=load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/${image}\0" \ ++ "loadrd=load ${devtype} ${bootpart} ${rdaddr} ${bootdir}/${rdfile}\0" \ ++ "loadfdt=echo loading ${fdtdir}/${fdtfile} ...; load ${devtype} ${bootpart} ${fdt_addr} ${fdtdir}/${fdtfile}\0" \ ++ "mmcboot=usb start;" \ ++ "for devtype in mmc usb; do " \ ++ "setenv devnum 0;" \ ++ "while ${devtype} dev ${devnum}; do " \ ++ "echo ${devtype} found on device ${devnum};" \ ++ "setenv bootpart ${devnum}:1;" \ ++ "part uuid ${devtype} ${bootpart} uuid;" \ ++ "setenv root PARTUUID=${uuid} rw rootwait;" \ ++ "echo Checking for: ${bootdir}/uEnv.txt ...;" \ ++ "if test -e ${devtype} ${bootpart} ${bootdir}/uEnv.txt; then " \ ++ "load ${devtype} ${bootpart} ${loadaddr} ${bootdir}/uEnv.txt;" \ ++ "env import -t ${loadaddr} ${filesize};" \ ++ "echo Loaded environment from ${bootdir}/uEnv.txt;" \ ++ "echo Checking if uenvcmd is set ...;" \ ++ "if test -n ${uenvcmd}; then " \ ++ "echo Running uenvcmd ...;" \ ++ "run uenvcmd;" \ ++ "fi;" \ ++ "fi;" \ ++ "if run loadimage; then " \ ++ "run mmcargs;" \ ++ "if run loadfdt; then " \ ++ "if run loadrd; then " \ ++ "bootz ${loadaddr} ${rdaddr}:${filesize} ${fdt_addr};" \ ++ "else " \ ++ "bootz ${loadaddr} - ${fdt_addr};" \ ++ "fi;" \ ++ "fi;" \ + "else " \ +- "echo WARN: Cannot load the DT; " \ +- "fi; " \ +- "fi; " \ +- "else " \ +- "bootz; " \ +- "fi;\0" \ ++ "echo No kernel found;" \ ++ "fi;" \ ++ "setexpr devnum ${devnum} + 1;" \ ++ "done;" \ ++ "done;\0" \ + "netargs=setenv bootargs console=${console},${baudrate} " \ + "root=/dev/nfs " \ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ +@@ -202,16 +227,7 @@ + + #define CONFIG_BOOTCOMMAND \ + "run findfdt; " \ +- "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" ++ "run mmcboot;" + + /* Physical Memory Map */ + #define CONFIG_NR_DRAM_BANKS 1 +-- +2.6.1 + diff --git a/unmaintained/uboot-wandboard/PKGBUILD b/unmaintained/uboot-wandboard/PKGBUILD new file mode 100644 index 000000000..661d83c11 --- /dev/null +++ b/unmaintained/uboot-wandboard/PKGBUILD @@ -0,0 +1,43 @@ +# U-Boot: Wandboard +# Maintainer: André Silva <emulatorman@hyperbola.info> + +buildarch=4 + +pkgname=uboot-wandboard +pkgver=2015.10 +pkgrel=1.parabola1 +pkgdesc="U-Boot for Wandboard" +arch=('armv7h') +url="http://git.denx.de/u-boot.git/" +license=('GPL') +makedepends=('bc') +depends=('linux-libre') +replaces=('uboot-wandboard-solo' 'uboot-wandboard-dual' 'uboot-wandboard-quad' 'uboot-wandboard-linux-libre') +conflicts=('uboot4extlinux-wandboard' 'uboot4grub-wandboard') +install=${pkgname}.install +source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" + '0001-parabola-arm-modifications.patch') +md5sums=('7c203b0fc3390a122d8e8b75f147eac5' + '87a2643750ab2152c6c91415e3949807') + +prepare() { + cd u-boot-${pkgver} + patch -Np1 -i ../0001-parabola-arm-modifications.patch +} + +build() { + cd u-boot-${pkgver} + + unset LDFLAGS + + make distclean + make wandboard_defconfig + make +} + +package() { + cd u-boot-${pkgver} + + mkdir -p "${pkgdir}"/boot + cp SPL u-boot.img "${pkgdir}"/boot +} diff --git a/unmaintained/uboot-wandboard/uboot-wandboard.install b/unmaintained/uboot-wandboard/uboot-wandboard.install new file mode 100644 index 000000000..246006ea4 --- /dev/null +++ b/unmaintained/uboot-wandboard/uboot-wandboard.install @@ -0,0 +1,24 @@ +flash_uboot() { + echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0." + echo "Do this now? [y|N]" + read -r shouldwe + if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then + dd if=/boot/SPL of=/dev/mmcblk0 seek=1 bs=1k + dd if=/boot/u-boot.img of=/dev/mmcblk0 seek=69 bs=1k + else + echo "You can do this later by running:" + echo "# dd if=/boot/SPL of=/dev/mmcblk0 seek=1 bs=1k" + echo "# dd if=/boot/u-boot.img of=/dev/mmcblk0 seek=69 bs=1k" + fi +} + +## arg 1: the new package version +post_install() { + flash_uboot +} + +## arg 1: the new package version +## arg 2: the old package version +post_upgrade() { + flash_uboot +} |