summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libre/uboot-cubox-i-linux-libre/check_dtbs_subdir_fix.patch23
-rw-r--r--libre/uboot-mx6_cubox-i/PKGBUILD (renamed from libre/uboot-cubox-i-linux-libre/PKGBUILD)34
-rw-r--r--libre/uboot-mx6_cubox-i/arm_board_use_weak.patch (renamed from libre/uboot-cubox-i-linux-libre/arm_board_use_weak.patch)0
-rw-r--r--libre/uboot-mx6_cubox-i/cmd_test_implement_-e_for_file_existance.patch (renamed from libre/uboot-cubox-i-linux-libre/cmd_test_implement_-e_for_file_existance.patch)0
-rw-r--r--libre/uboot-mx6_cubox-i/common-main.c-make-show_boot_progress-__weak.patch (renamed from libre/uboot-cubox-i-linux-libre/common-main.c-make-show_boot_progress-__weak.patch)0
-rw-r--r--libre/uboot-mx6_cubox-i/kernel-add-support-for-gcc-5.patch (renamed from libre/uboot-cubox-i-linux-libre/kernel-add-support-for-gcc-5.patch)0
-rw-r--r--libre/uboot-mx6_cubox-i/leds_missing_include.patch (renamed from libre/uboot-cubox-i-linux-libre/leds_missing_include.patch)0
-rw-r--r--libre/uboot-mx6_cubox-i/no-unalligned-access.patch (renamed from libre/uboot-cubox-i-linux-libre/no-unalligned-access.patch)0
-rw-r--r--libre/uboot-mx6_cubox-i/parabola-modifications.patch90
-rw-r--r--libre/uboot-mx6_cubox-i/remove_unnecessary_inits.patch (renamed from libre/uboot-cubox-i-linux-libre/remove_unnecessary_inits.patch)0
-rw-r--r--libre/uboot-mx6_cubox-i/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch (renamed from libre/uboot-cubox-i-linux-libre/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch)0
-rw-r--r--libre/uboot-mx6_cubox-i/uboot-mx6_cubox-i.install (renamed from libre/uboot-cubox-i-linux-libre/uboot-cubox-i-linux-libre.install)0
12 files changed, 106 insertions, 41 deletions
diff --git a/libre/uboot-cubox-i-linux-libre/check_dtbs_subdir_fix.patch b/libre/uboot-cubox-i-linux-libre/check_dtbs_subdir_fix.patch
deleted file mode 100644
index 34d1ff46b..000000000
--- a/libre/uboot-cubox-i-linux-libre/check_dtbs_subdir_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ruN a/include/configs/mx6_cubox-i.h b/include/configs/mx6_cubox-i.h
---- a/include/configs/mx6_cubox-i.h 2015-06-30 15:34:48.000000000 +0000
-+++ b/include/configs/mx6_cubox-i.h 2015-08-28 05:48:43.225896471 +0000
-@@ -176,6 +176,7 @@
- "bootfile=auto\0" \
-- "bootenv=uEnv.txt\0" \
-+ "bootenv=uboot-cubox-i-linux-libre/uEnv.txt\0" \
- "boot_prefixes=/ /boot/\0" \
-+ "fdtfile_prefix=dtbs/linux-libre\0" \
- "console=ttymxc0\0" \
- "splashpos=m,m\0" \
- "fdt_high=0xffffffff\0" \
-@@ -220,7 +221,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 " \
diff --git a/libre/uboot-cubox-i-linux-libre/PKGBUILD b/libre/uboot-mx6_cubox-i/PKGBUILD
index dc846cffe..d8355892a 100644
--- a/libre/uboot-cubox-i-linux-libre/PKGBUILD
+++ b/libre/uboot-mx6_cubox-i/PKGBUILD
@@ -1,21 +1,19 @@
-# U-Boot: UDOO
-# Maintainer (Arch): Dave Higham <pepedog@archlinuxarm.org>
-# Contributor: André Silva <emulatorman@parabola.nu>
+# Maintainer: André Silva <emulatorman@parabola.nu>
buildarch=4
-_pkgname=linux-libre
-pkgname=("uboot-cubox-i-${_pkgname}")
+pkgbase=uboot-mx6_cubox-i
+pkgname=('uboot-mx6_cubox-i')
pkgver=2013.10
-pkgrel=4
+pkgrel=1
arch=('armv7h')
url="http://git.denx.de/u-boot.git/"
license=('GPL')
-makedepends=('bc')
depends=('linux-libre')
-replaces=('uboot-cubox-i')
+replaces=('uboot-cubox-i' 'uboot-cubox-i-linux-libre')
+conflicts=('uboot4extlinux-mx6_cubox-i' 'uboot4grub-mx6_cubox-i')
option=('!strip')
-_commit=e509dd30e97bf2cbce21502e4462d9d7c1d85daa
+_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'
@@ -24,8 +22,8 @@ source=("uboot-${_commit}.tar.gz::https://github.com/SolidRun/u-boot-imx6/archiv
'u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch'
'no-unalligned-access.patch'
'common-main.c-make-show_boot_progress-__weak.patch'
- 'check_dtbs_subdir_fix.patch')
-md5sums=('3417d53a913949fd80c052fc8662c2a4'
+ 'parabola-modifications.patch')
+md5sums=('8dc15f4cf0b244a8d9598a2ce93056a4'
'721a46867e189d8dedc6b6f86a536a34'
'b8cd082b76224d157d55404d0bc87831'
'cf823fe2da67b8db5b9de9352a815f91'
@@ -33,7 +31,7 @@ md5sums=('3417d53a913949fd80c052fc8662c2a4'
'8ed91e4257bfb7e0971fa988342537a3'
'629d34349b5652e2d4274ad89e1c4481'
'8087672256020417438b12ec4946e1cf'
- '5d5ea5bd73957bbf6ec18e1ae65a5e9c')
+ '19178e6d85b6b8278fa70eee5db18f83')
prepare() {
cd u-boot-imx6-${_commit}
@@ -44,7 +42,7 @@ prepare() {
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 ../check_dtbs_subdir_fix.patch
+ patch -Np1 -i ../parabola-modifications.patch
}
build() {
@@ -60,12 +58,12 @@ build() {
}
package() {
- pkgdesc="U-Boot for all CuBox-i variants (built for the linux-libre kernel package)"
- install=${pkgname}.install
+ pkgdesc="U-Boot for all CuBox-i variants"
+ install=${pkgbase}.install
cd u-boot-imx6-${_commit}
- mkdir -p "${pkgdir}/boot/${pkgname}"
- cp u-boot.img "${pkgdir}/boot/${pkgname}"
- cp SPL "${pkgdir}/boot/${pkgname}"
+ mkdir -p "${pkgdir}"/boot
+ cp u-boot.img "${pkgdir}"/boot
+ cp SPL "${pkgdir}"/boot
}
diff --git a/libre/uboot-cubox-i-linux-libre/arm_board_use_weak.patch b/libre/uboot-mx6_cubox-i/arm_board_use_weak.patch
index 58ab1d045..58ab1d045 100644
--- a/libre/uboot-cubox-i-linux-libre/arm_board_use_weak.patch
+++ b/libre/uboot-mx6_cubox-i/arm_board_use_weak.patch
diff --git a/libre/uboot-cubox-i-linux-libre/cmd_test_implement_-e_for_file_existance.patch b/libre/uboot-mx6_cubox-i/cmd_test_implement_-e_for_file_existance.patch
index 02f2d9493..02f2d9493 100644
--- a/libre/uboot-cubox-i-linux-libre/cmd_test_implement_-e_for_file_existance.patch
+++ b/libre/uboot-mx6_cubox-i/cmd_test_implement_-e_for_file_existance.patch
diff --git a/libre/uboot-cubox-i-linux-libre/common-main.c-make-show_boot_progress-__weak.patch b/libre/uboot-mx6_cubox-i/common-main.c-make-show_boot_progress-__weak.patch
index 41b9c5cb2..41b9c5cb2 100644
--- a/libre/uboot-cubox-i-linux-libre/common-main.c-make-show_boot_progress-__weak.patch
+++ b/libre/uboot-mx6_cubox-i/common-main.c-make-show_boot_progress-__weak.patch
diff --git a/libre/uboot-cubox-i-linux-libre/kernel-add-support-for-gcc-5.patch b/libre/uboot-mx6_cubox-i/kernel-add-support-for-gcc-5.patch
index 30718c561..30718c561 100644
--- a/libre/uboot-cubox-i-linux-libre/kernel-add-support-for-gcc-5.patch
+++ b/libre/uboot-mx6_cubox-i/kernel-add-support-for-gcc-5.patch
diff --git a/libre/uboot-cubox-i-linux-libre/leds_missing_include.patch b/libre/uboot-mx6_cubox-i/leds_missing_include.patch
index 9828d1e89..9828d1e89 100644
--- a/libre/uboot-cubox-i-linux-libre/leds_missing_include.patch
+++ b/libre/uboot-mx6_cubox-i/leds_missing_include.patch
diff --git a/libre/uboot-cubox-i-linux-libre/no-unalligned-access.patch b/libre/uboot-mx6_cubox-i/no-unalligned-access.patch
index 6582724e7..6582724e7 100644
--- a/libre/uboot-cubox-i-linux-libre/no-unalligned-access.patch
+++ b/libre/uboot-mx6_cubox-i/no-unalligned-access.patch
diff --git a/libre/uboot-mx6_cubox-i/parabola-modifications.patch b/libre/uboot-mx6_cubox-i/parabola-modifications.patch
new file mode 100644
index 000000000..757622e82
--- /dev/null
+++ b/libre/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/libre/uboot-cubox-i-linux-libre/remove_unnecessary_inits.patch b/libre/uboot-mx6_cubox-i/remove_unnecessary_inits.patch
index 8ab039177..8ab039177 100644
--- a/libre/uboot-cubox-i-linux-libre/remove_unnecessary_inits.patch
+++ b/libre/uboot-mx6_cubox-i/remove_unnecessary_inits.patch
diff --git a/libre/uboot-cubox-i-linux-libre/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch b/libre/uboot-mx6_cubox-i/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch
index 4a5e0de4e..4a5e0de4e 100644
--- a/libre/uboot-cubox-i-linux-libre/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch
+++ b/libre/uboot-mx6_cubox-i/u-boot-002-gcc5-use_gcc_inline_version_instead_c99.patch
diff --git a/libre/uboot-cubox-i-linux-libre/uboot-cubox-i-linux-libre.install b/libre/uboot-mx6_cubox-i/uboot-mx6_cubox-i.install
index ff3b52d2a..ff3b52d2a 100644
--- a/libre/uboot-cubox-i-linux-libre/uboot-cubox-i-linux-libre.install
+++ b/libre/uboot-mx6_cubox-i/uboot-mx6_cubox-i.install
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-25 14:02:46 +0000