diff --git a/alarm/uboot-olinuxino/0001-arch-linux-arm-modifications.patch b/alarm/uboot-olinuxino/0001-arch-linux-arm-modifications.patch deleted file mode 100644 index d8704909f..000000000 --- a/alarm/uboot-olinuxino/0001-arch-linux-arm-modifications.patch +++ /dev/null @@ -1,168 +0,0 @@ -From ff573490833587ad9b78d56bb17ac596584e7d39 Mon Sep 17 00:00:00 2001 -From: Kevin Mihelich <kevin@archlinuxarm.org> -Date: Sat, 31 Oct 2015 10:05:29 -0600 -Subject: [PATCH] arch linux arm modifications - -Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org> ---- - include/configs/mx23_olinuxino.h | 131 +++++++++++++++++---------------------- - 1 file changed, 58 insertions(+), 73 deletions(-) - -diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h -index 7747258..7bfbd24 100644 ---- a/include/configs/mx23_olinuxino.h -+++ b/include/configs/mx23_olinuxino.h -@@ -17,6 +17,16 @@ - - #define CONFIG_CMD_LED - -+/* Arch Linux ARM extras */ -+#define CONFIG_IDENT_STRING " Arch Linux ARM" -+#define CONFIG_CMD_SETEXPR -+#define CONFIG_CMD_PART -+#define CONFIG_PARTITION_UUIDS -+#define CONFIG_CMD_EXT4 -+#define CONFIG_CMD_FS_GENERIC -+#define CONFIG_CMD_BOOTZ -+#define CONFIG_SUPPORT_RAW_INITRD -+ - /* Memory configuration */ - #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ - #define PHYS_SDRAM_1 0x40000000 /* Base address */ -@@ -63,85 +73,60 @@ - - /* Extra Environment */ - #define CONFIG_EXTRA_ENV_SETTINGS \ -- "update_sd_firmware_filename=u-boot.sd\0" \ -- "update_sd_firmware=" /* Update the SD firmware partition */ \ -- "if mmc rescan ; then " \ -- "if tftp ${update_sd_firmware_filename} ; then " \ -- "setexpr fw_sz ${filesize} / 0x200 ; " /* SD block size */ \ -- "setexpr fw_sz ${fw_sz} + 1 ; " \ -- "mmc write ${loadaddr} 0x800 ${fw_sz} ; " \ -- "fi ; " \ -- "fi\0" \ -- "script=boot.scr\0" \ -- "uimage=uImage\0" \ - "console=ttyAMA0\0" \ -- "fdt_file=imx23-olinuxino.dtb\0" \ -- "fdt_addr=0x41000000\0" \ -- "boot_fdt=try\0" \ -- "ip_dyn=yes\0" \ -- "mmcdev=0\0" \ -- "mmcpart=2\0" \ -- "mmcroot=/dev/mmcblk0p3 rw rootwait\0" \ -+ "fdtfile=imx23-olinuxino.dtb\0" \ -+ "fdtaddr=0x41000000\0" \ -+ "rdfile=initramfs-linux.img\0" \ -+ "rdaddr=0x42A00000\0" \ -+ "bootdir=/boot\0" \ -+ "fdtdir=/boot/dtbs\0" \ -+ "bootfile=zImage\0" \ -+ "optargs=\0" \ -+ "cmdline=\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" \ -- "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\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 " \ -- "bootm ${loadaddr} - ${fdt_addr}; " \ -- "else " \ -- "if test ${boot_fdt} = try; then " \ -- "bootm; " \ -- "else " \ -- "echo WARN: Cannot load the DT; " \ -- "fi; " \ -- "fi; " \ -- "else " \ -- "bootm; " \ -- "fi;\0" \ -- "netargs=setenv bootargs console=${console},${baudrate} " \ -- "root=/dev/nfs " \ -- "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ -- "netboot=echo Booting from net ...; " \ -- "usb start; " \ -- "run netargs; " \ -- "if test ${ip_dyn} = yes; then " \ -- "setenv get_cmd dhcp; " \ -- "else " \ -- "setenv get_cmd tftp; " \ -- "fi; " \ -- "${get_cmd} ${uimage}; " \ -- "if test ${boot_fdt} = yes; then " \ -- "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ -- "bootm ${loadaddr} - ${fdt_addr}; " \ -- "else " \ -- "if test ${boot_fdt} = try; then " \ -- "bootm; " \ -+ "${optargs} " \ -+ "root=${root} " \ -+ "${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};" \ -+ "if test ${devtype} = mmc; then setenv bootpart ${devnum}:2; else setenv bootpart ${devnum}:1; fi;" \ -+ "part uuid ${devtype} ${bootpart} uuid;" \ -+ "setenv root PARTUUID=${uuid} rw rootwait fixrtc;" \ -+ "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 WARN: Cannot load the DT; " \ -+ "echo No kernel found;" \ - "fi;" \ -- "fi; " \ -- "else " \ -- "bootm; " \ -- "fi;\0" -+ "setexpr devnum ${devnum} + 1;" \ -+ "done;" \ -+ "done;\0" - - #define CONFIG_BOOTCOMMAND \ -- "mmc dev ${mmcdev}; if mmc rescan; then " \ -- "if run loadbootscript; then " \ -- "run bootscript; " \ -- "else " \ -- "if run loaduimage; then " \ -- "run mmcboot; " \ -- "else run netboot; " \ -- "fi; " \ -- "fi; " \ -- "else run netboot; fi" -+ "run mmcboot;" - - /* The rest of the configuration is shared */ - #include <configs/mxs.h> --- -2.9.3 - diff --git a/alarm/uboot-olinuxino/PKGBUILD b/alarm/uboot-olinuxino/PKGBUILD deleted file mode 100644 index 3f4aa868b..000000000 --- a/alarm/uboot-olinuxino/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# U-Boot for i.MX233-OLinuXino -# Maintainer: Kevin Mihelich <kevin@archlinuxarm.org> -# Contributor: Kiril Zyapkov <kiril.zyapkov@gmail.com> - -buildarch=2 - -pkgname=uboot-olinuxino -pkgdesc="U-Boot for i.MX233-OLinuXino" -pkgver=2016.07 -pkgrel=1 -arch=('arm') -license=('GPL') -makedepends=('git' 'bc') -install=$pkgname.install -options=('!strip') -backup=('boot/uEnv.txt') -source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2" - '0001-arch-linux-arm-modifications.patch' - 'uEnv.txt') -md5sums=('425a3fa610a7d972e5092a0e92276c70' - '8a8fa0c90fc6898ac4de7d8fad52723f' - 'd41d8cd98f00b204e9800998ecf8427e') - -prepare() { - cd "$srcdir/u-boot-${pkgver}" - git apply ../0001-arch-linux-arm-modifications.patch -} - -build() { - cd "$srcdir/u-boot-${pkgver}" - - unset LDFLAGS CFLAGS CXXFLAGS - - make distclean - make mx23_olinuxino_config - make u-boot.sb -} - -package() { - mkdir -p "${pkgdir}/boot" - cp "${srcdir}/u-boot-${pkgver}"/u-boot.sb "${srcdir}"/uEnv.txt "${pkgdir}/boot" -} diff --git a/alarm/uboot-olinuxino/uEnv.txt b/alarm/uboot-olinuxino/uEnv.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/alarm/uboot-olinuxino/uboot-olinuxino.install b/alarm/uboot-olinuxino/uboot-olinuxino.install deleted file mode 100644 index 8703b4923..000000000 --- a/alarm/uboot-olinuxino/uboot-olinuxino.install +++ /dev/null @@ -1,22 +0,0 @@ -flash_uboot() { - echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0p1." - 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.sb of=/dev/mmcblk0p1 bs=512 seek=4 - else - echo "You can do this later by running:" - echo "# dd if=/boot/u-boot.sb of=/dev/mmcblk0p1 bs=512 seek=4" - 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 -}