summaryrefslogtreecommitdiff
path: root/libre-testing
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-02-23 02:17:37 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-02-23 02:21:30 -0300
commit3fae42d6c953262288f90d2c977e82c595cae03f (patch)
tree229d1063b3e6417377724318b0fb697c306bfa92 /libre-testing
parent1416a2d97114247ed5600e3f04f4f7d335b25578 (diff)
downloadabslibre-3fae42d6c953262288f90d2c977e82c595cae03f.tar.gz
abslibre-3fae42d6c953262288f90d2c977e82c595cae03f.tar.bz2
abslibre-3fae42d6c953262288f90d2c977e82c595cae03f.zip
uboot-am335x_bone: fix console settings args from ttyS0 to ttyO0 and remove LANG=en_US.UTF-8; optimize patch
Diffstat (limited to 'libre-testing')
-rw-r--r--libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch229
-rw-r--r--libre-testing/uboot-am335x_bone/PKGBUILD6
-rw-r--r--libre-testing/uboot-am335x_bone/extlinux.conf18
3 files changed, 33 insertions, 220 deletions
diff --git a/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch b/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch
index e5e027d1a..2574a7929 100644
--- a/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot-am335x_bone/0001-parabola-arm-modifications.patch
@@ -1,37 +1,7 @@
-diff -Nur u-boot-2015.04.orig/configs/am335x_evm_defconfig u-boot-2015.04/configs/am335x_evm_defconfig
---- u-boot-2015.04.orig/configs/am335x_evm_defconfig 2015-04-13 11:53:03.000000000 -0300
-+++ u-boot-2015.04/configs/am335x_evm_defconfig 2016-02-21 23:00:16.971065261 -0300
-@@ -1,7 +1,6 @@
- CONFIG_SPL=y
- CONFIG_SPL_STACK_R=y
- CONFIG_SPL_STACK_R_ADDR=0x82000000
--CONFIG_SYS_EXTRA_OPTIONS="NAND"
--CONFIG_CONS_INDEX=1
-+CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1"
- CONFIG_ARM=y
- CONFIG_TARGET_AM335X_EVM=y
diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/include/configs/am335x_evm.h
--- u-boot-2015.04.orig/include/configs/am335x_evm.h 2015-04-13 11:53:03.000000000 -0300
-+++ u-boot-2015.04/include/configs/am335x_evm.h 2016-02-22 17:43:23.889522373 -0300
-@@ -17,6 +17,7 @@
- #define __CONFIG_AM335X_EVM_H
-
- #include <configs/ti_am335x_common.h>
-+#define CONFIG_ENV_IS_NOWHERE
-
- #ifndef CONFIG_SPL_BUILD
- #ifndef CONFIG_FIT
-@@ -45,6 +46,9 @@
- /* Enhance our eMMC support / experience. */
- #define CONFIG_CMD_GPT
- #define CONFIG_EFI_PARTITION
-+#define CONFIG_CMD_PART
-+#define CONFIG_PARTITION_UUIDS
-+#define CONFIG_CMD_SETEXPR
-
- #ifdef CONFIG_NAND
- #define NANDARGS \
-@@ -67,130 +71,80 @@
++++ u-boot-2015.04/include/configs/am335x_evm.h 2016-02-22 21:45:18.256462447 -0300
+@@ -67,11 +67,18 @@
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
@@ -41,192 +11,33 @@ diff -Nur u-boot-2015.04.orig/include/configs/am335x_evm.h u-boot-2015.04/includ
+#define BOOT_TARGET_DEVICES(func)
+#include <config_distro_bootcmd.h>
+
-+/*
-+ * 512M RAM (512M minimum minus space for the framebuffer),
-+ * 32M uncompressed kernel, 16M compressed kernel, 1M fdt,
-+ * 1M script, 1M pxe and the ramdisk at the end.
-+ */
-+#define MEM_LAYOUT_ENV_SETTINGS \
-+ "kernel_addr_r=0x82000000\0" \
-+ "fdt_addr_r=0x88000000\0" \
-+ "scriptaddr=0x92000000\0" \
-+ "pxefile_addr_r=0x90000000\0" \
-+ "ramdisk_addr_r=0x88080000\0"
-+
#ifndef CONFIG_SPL_BUILD
#define CONFIG_EXTRA_ENV_SETTINGS \
+ BOOTENV \
DEFAULT_LINUX_BOOT_ENV \
-- "boot_fdt=try\0" \
+ "boot_fdt=try\0" \
- "bootpart=0:2\0" \
-+ MEM_LAYOUT_ENV_SETTINGS \
+ "bootpart=0:1\0" \
"bootdir=/boot\0" \
-- "bootfile=zImage\0" \
-- "fdtfile=undefined\0" \
- "console=ttyO0,115200n8\0" \
- "partitions=" \
+ "bootfile=zImage\0" \
+ "fdtfile=undefined\0" \
+@@ -80,8 +87,10 @@
"uuid_disk=${uuid_gpt_disk};" \
"name=rootfs,start=2MiB,size=-,uuid=${uuid_gpt_rootfs}\0" \
"optargs=\0" \
-- "mmcdev=0\0" \
++ "devtype=mmc\0" \
++ "devnum=0\0" \
+ "mmcdev=0\0" \
- "mmcroot=/dev/mmcblk0p2 ro\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" \
-+ "cape_disable=\0" \
-+ "cape_enable=\0" \
-+ "cmdline=\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" \
-- "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \
-- "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
-- "source ${loadaddr}\0" \
-- "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
-- "importbootenv=echo Importing environment from mmc ...; " \
-- "env import -t -r $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 loadbootscript; then " \
-- "run bootscript;" \
-- "else " \
-- "if run loadbootenv; then " \
-- "echo Loaded environment from ${bootenv};" \
-- "run importbootenv;" \
-- "fi;" \
-- "if test -n $uenvcmd; then " \
-- "echo Running uenvcmd ...;" \
-- "run uenvcmd;" \
-+ "${cape_disable} " \
-+ "${cape_enable} " \
-+ "root=${root} " \
-+ "${cmdline}\0" \
-+ "mmcboot=usb start;" \
-+ "for devtype in mmc usb; 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 fixrtc;" \
-+ "echo Checking for: ${bootdir}/uEnv.txt ...;" \
-+ "gpio set 54;" \
-+ "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;" \
-+ "gpio set 55;" \
-+ "run scan_dev_for_boot;" \
-+ "gpio clear 54; gpio clear 55;" \
-+ "setexpr devnum ${devnum} + 1;" \
++ "mmcroot=/dev/mmcblk0p1 ro\0" \
+ "mmcrootfstype=ext4 rootwait\0" \
+ "rootpath=/export/rootfs\0" \
+ "nfsopts=nolock\0" \
+@@ -149,6 +158,7 @@
+ "echo Running uenvcmd ...;" \
+ "run uenvcmd;" \
+ "fi;" \
++ "usb start; run scan_dev_for_boot;" \
+ "if run loadimage; then " \
+ "run mmcloados;" \
"fi;" \
-- "if run loadimage; then " \
-- "run mmcloados;" \
-- "fi;" \
-- "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="\
-- "if test $board_name = A335BONE; then " \
-- "setenv fdtfile am335x-bone.dtb; fi; " \
-- "if test $board_name = A335BNLT; then " \
-- "setenv fdtfile am335x-boneblack.dtb; fi; " \
-- "if test $board_name = A33515BB; then " \
-- "setenv fdtfile am335x-evm.dtb; fi; " \
-- "if test $board_name = A335X_SK; then " \
-- "setenv fdtfile am335x-evmsk.dtb; fi; " \
-- "if test $fdtfile = undefined; then " \
-- "echo WARNING: Could not determine device tree to use; fi; \0" \
-+ "done;" \
-+ "done;\0" \
- NANDARGS \
- DFUARGS
- #endif
-
- #define CONFIG_BOOTCOMMAND \
-- "run findfdt; " \
-- "run mmcboot;" \
-- "setenv mmcdev 1; " \
-- "setenv bootpart 1:2; " \
-+ "gpio set 53;" \
- "run mmcboot;" \
-- "run nandboot;"
-+ "gpio clear 54; gpio clear 55;"
-
- /* NS16550 Configuration */
- #define CONFIG_SYS_NS16550_COM1 0x44e09000 /* Base EVM has UART0 */
-@@ -329,9 +283,8 @@
- #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"
-+#define CONFIG_CMD_USB_MASS_STORAGE
-+#define CONFIG_USB_GADGET_MASS_STORAGE
-
- /* USB TI's IDs */
- #define CONFIG_G_DNL_VENDOR_NUM 0x0451
diff --git a/libre-testing/uboot-am335x_bone/PKGBUILD b/libre-testing/uboot-am335x_bone/PKGBUILD
index 360de9456..03de3433a 100644
--- a/libre-testing/uboot-am335x_bone/PKGBUILD
+++ b/libre-testing/uboot-am335x_bone/PKGBUILD
@@ -1,5 +1,7 @@
# U-Boot: BeagleBone and BeagleBone Black
# Maintainer: André Silva <emulatorman@parabola.nu>
+# Contributor: Jookia <166291@gmail.com>
+# Contributor: Márcio Silva <coadde@parabola.nu>
buildarch=4
@@ -21,8 +23,8 @@ source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
'extlinux.conf'
'uEnv.txt')
md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd'
- '35111b3cfe545ce3a3fb37fafda43cc7'
- '778611dd03b67e7164081228a1ac93b3'
+ '7aaf785aa34682a174424f50988728e5'
+ '8b941b3debf97600476edb717899c4f6'
'ccb79775b81654e16fca18825c7f2506')
prepare() {
diff --git a/libre-testing/uboot-am335x_bone/extlinux.conf b/libre-testing/uboot-am335x_bone/extlinux.conf
index 843c60b60..9eb7959fe 100644
--- a/libre-testing/uboot-am335x_bone/extlinux.conf
+++ b/libre-testing/uboot-am335x_bone/extlinux.conf
@@ -2,45 +2,45 @@ menu title Welcome to Parabola!
label Parabola GNU/Linux-libre w/ linux-libre kernel
kernel /boot/vmlinuz-linux-libre
- append ro root=/dev/mmcblk0p1 console=ttyS0,115200n8 LANG=en_US.UTF-8
+ append ro root=/dev/mmcblk0p1 console=ttyO0,115200n8
fdtdir /boot/dtbs/linux-libre
#label Parabola GNU/Linux-libre w/ linux-libre-lts kernel
# kernel /boot/vmlinuz-linux-libre-lts
-# append ro root=/dev/mmcblk0p1 console=ttyS0,115200n8 LANG=en_US.UTF-8
+# append ro root=/dev/mmcblk0p1 console=ttyO0,115200n8
# fdtdir /boot/dtbs/linux-libre-lts
#label Parabola GNU/Linux-libre w/ linux-libre-knock kernel
# kernel /boot/vmlinuz-linux-libre-knock
-# append ro root=/dev/mmcblk0p1 console=ttyS0,115200n8 LANG=en_US.UTF-8
+# append ro root=/dev/mmcblk0p1 console=ttyO0,115200n8
# fdtdir /boot/dtbs/linux-libre-knock
#label Parabola GNU/Linux-libre w/ linux-libre-lts-knock kernel
# kernel /boot/vmlinuz-linux-libre-lts-knock
-# append ro root=/dev/mmcblk0p1 console=ttyS0,115200n8 LANG=en_US.UTF-8
+# append ro root=/dev/mmcblk0p1 console=ttyO0,115200n8
# fdtdir /boot/dtbs/linux-libre-lts-knock
#label Parabola GNU/Linux-libre w/ linux-libre-grsec kernel
# kernel /boot/vmlinuz-linux-libre-grsec
-# append ro root=/dev/mmcblk0p1 console=ttyS0,115200n8 LANG=en_US.UTF-8
+# append ro root=/dev/mmcblk0p1 console=ttyO0,115200n8
# fdtdir /boot/dtbs/linux-libre-grsec
#label Parabola GNU/Linux-libre w/ linux-libre-grsec-knock kernel
# kernel /boot/vmlinuz-linux-libre-grsec-knock
-# append ro root=/dev/mmcblk0p1 console=ttyS0,115200n8 LANG=en_US.UTF-8
+# append ro root=/dev/mmcblk0p1 console=ttyO0,115200n8
# fdtdir /boot/dtbs/linux-libre-grsec-knock
#label Parabola GNU/Linux-libre w/ linux-libre-audit kernel
# kernel /boot/vmlinuz-linux-libre-audit
-# append ro root=/dev/mmcblk0p1 console=ttyS0,115200n8 LANG=en_US.UTF-8
+# append ro root=/dev/mmcblk0p1 console=ttyO0,115200n8
# fdtdir /boot/dtbs/linux-libre-audit
#label Parabola GNU/Linux-libre w/ linux-libre-pck kernel
# kernel /boot/vmlinuz-linux-libre-pck
-# append ro root=/dev/mmcblk0p1 console=ttyS0,115200n8 LANG=en_US.UTF-8
+# append ro root=/dev/mmcblk0p1 console=ttyO0,115200n8
# fdtdir /boot/dtbs/linux-libre-pck
#label Parabola GNU/Linux-libre w/ linux-libre-rt kernel
# kernel /boot/vmlinuz-linux-libre-rt
-# append ro root=/dev/mmcblk0p1 console=ttyS0,115200n8 LANG=en_US.UTF-8
+# append ro root=/dev/mmcblk0p1 console=ttyO0,115200n8
# fdtdir /boot/dtbs/linux-libre-rt