diff options
Diffstat (limited to 'libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch')
| -rw-r--r-- | libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch | 194 |
1 files changed, 171 insertions, 23 deletions
diff --git a/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch b/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch index ac4f758fe..326b4aaa0 100644 --- a/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch +++ b/libre-testing/uboot-udoo/0001-parabola-arm-modifications.patch @@ -1,6 +1,6 @@ diff -Nur u-boot-2015.01.orig/board/udoo/1066mhz_4x256mx16_dl.cfg u-boot-2015.01/board/udoo/1066mhz_4x256mx16_dl.cfg --- u-boot-2015.01.orig/board/udoo/1066mhz_4x256mx16_dl.cfg 1969-12-31 21:00:00.000000000 -0300 -+++ u-boot-2015.01/board/udoo/1066mhz_4x256mx16_dl.cfg 2016-02-24 01:42:53.330380669 -0300 ++++ u-boot-2015.01/board/udoo/1066mhz_4x256mx16_dl.cfg 2016-02-23 18:15:32.854611743 -0300 @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2013 Seco USA Inc @@ -62,7 +62,7 @@ diff -Nur u-boot-2015.01.orig/board/udoo/1066mhz_4x256mx16_dl.cfg u-boot-2015.01 +DATA 4, MX6_MMDC_P0_MDSCR, 0x00000000 diff -Nur u-boot-2015.01.orig/board/udoo/ddr-setup_dl.cfg u-boot-2015.01/board/udoo/ddr-setup_dl.cfg --- u-boot-2015.01.orig/board/udoo/ddr-setup_dl.cfg 1969-12-31 21:00:00.000000000 -0300 -+++ u-boot-2015.01/board/udoo/ddr-setup_dl.cfg 2016-02-24 01:42:53.330380669 -0300 ++++ u-boot-2015.01/board/udoo/ddr-setup_dl.cfg 2016-02-23 18:15:32.854611743 -0300 @@ -0,0 +1,84 @@ +/* + * Copyright (C) 2013 Seco USA Inc @@ -150,7 +150,7 @@ diff -Nur u-boot-2015.01.orig/board/udoo/ddr-setup_dl.cfg u-boot-2015.01/board/u +DATA 4, MX6_MMDC_P1_MPRDDQBY3DL, 0x33333333 diff -Nur u-boot-2015.01.orig/board/udoo/udoo-dl.cfg u-boot-2015.01/board/udoo/udoo-dl.cfg --- u-boot-2015.01.orig/board/udoo/udoo-dl.cfg 1969-12-31 21:00:00.000000000 -0300 -+++ u-boot-2015.01/board/udoo/udoo-dl.cfg 2016-02-24 01:42:53.330380669 -0300 ++++ u-boot-2015.01/board/udoo/udoo-dl.cfg 2016-02-23 18:15:32.854611743 -0300 @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2013 Boundary Devices @@ -183,15 +183,24 @@ diff -Nur u-boot-2015.01.orig/board/udoo/udoo-dl.cfg u-boot-2015.01/board/udoo/u +#include "clocks.cfg" diff -Nur u-boot-2015.01.orig/configs/udoo_dl_defconfig u-boot-2015.01/configs/udoo_dl_defconfig --- u-boot-2015.01.orig/configs/udoo_dl_defconfig 1969-12-31 21:00:00.000000000 -0300 -+++ u-boot-2015.01/configs/udoo_dl_defconfig 2016-02-24 01:42:53.330380669 -0300 ++++ u-boot-2015.01/configs/udoo_dl_defconfig 2016-02-23 18:15:32.854611743 -0300 @@ -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 -Nur u-boot-2015.01.orig/include/configs/udoo.h u-boot-2015.01/include/configs/udoo.h --- u-boot-2015.01.orig/include/configs/udoo.h 2015-01-12 12:39:08.000000000 -0200 -+++ u-boot-2015.01/include/configs/udoo.h 2016-02-24 01:47:09.384245992 -0300 -@@ -96,11 +96,26 @@ ++++ u-boot-2015.01/include/configs/udoo.h 2016-02-23 18:24:17.779054304 -0300 +@@ -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,107 @@ #define CONFIG_BOUNCE_BUFFER #define CONFIG_CMD_EXT2 #define CONFIG_CMD_FAT @@ -207,35 +216,174 @@ diff -Nur u-boot-2015.01.orig/include/configs/udoo.h u-boot-2015.01/include/conf #define CONFIG_DEFAULT_FDT_FILE "imx6q-udoo.dtb" +#endif + -+/* Enable extlinux boot support */ ++/* Enable Extlinux boot support */ +#define CONFIG_CMD_PXE +#define CONFIG_MENU +#define BOOT_TARGET_DEVICES(func) +#include <config_distro_bootcmd.h> #define CONFIG_EXTRA_ENV_SETTINGS \ +- "script=boot.scr\0" \ +- "image=zImage\0" \ +- "console=ttymxc1\0" \ + BOOTENV \ - "script=boot.scr\0" \ - "image=zImage\0" \ - "console=ttymxc1\0" \ -@@ -111,9 +126,11 @@ - "fdt_addr=0x18000000\0" \ - "boot_fdt=try\0" \ ++ "bootfile=zImage\0" \ ++ "bootdir=/boot\0" \ ++ "console=ttymxc1,115200\0" \ + "splashpos=m,m\0" \ + "fdt_high=0xffffffff\0" \ ++ "rdaddr=0x12A00000\0" \ ++ "rdfile=initramfs-linux.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\0" \ ++ "fdtaddr=0x18000000\0" \ "ip_dyn=yes\0" \ ++ "optargs=\0" \ ++ "video=\0" \ + "devtype=mmc\0" \ + "devnum=0\0" \ "mmcdev=0\0" \ - "mmcpart=1\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" \ - "update_sd_firmware_filename=u-boot.imx\0" \ - "update_sd_firmware=" \ - "if test ${ip_dyn} = yes; then " \ -@@ -178,6 +195,7 @@ ++ "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; " \ ++ "run scan_dev_for_boot;" \ ++ "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 +208,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 +224,7 @@ + "fi;\0" #define CONFIG_BOOTCOMMAND \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ -+ "run scan_dev_for_boot;" \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ +- "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 +@@ -227,6 +265,7 @@ + + #define CONFIG_OF_LIBFDT + #define CONFIG_CMD_BOOTZ ++#define CONFIG_SUPPORT_RAW_INITRD + + #ifndef CONFIG_SYS_DCACHE_OFF + #define CONFIG_CMD_CACHE |