diff options
Diffstat (limited to 'libre/uboot-grub/uboot-am335x_evm_boot-on-grub.patch')
| -rw-r--r-- | libre/uboot-grub/uboot-am335x_evm_boot-on-grub.patch | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/libre/uboot-grub/uboot-am335x_evm_boot-on-grub.patch b/libre/uboot-grub/uboot-am335x_evm_boot-on-grub.patch deleted file mode 100644 index 8ff1c238f..000000000 --- a/libre/uboot-grub/uboot-am335x_evm_boot-on-grub.patch +++ /dev/null @@ -1,99 +0,0 @@ -diff -Nur a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h ---- a/include/configs/am335x_evm.h 2015-07-14 14:32:21.000000000 -0300 -+++ b/include/configs/am335x_evm.h 2015-09-29 03:46:04.805107365 -0300 -@@ -58,9 +58,8 @@ - "nandrootfstype=ubifs rootwait=1\0" \ - "nandboot=echo Booting from nand ...; " \ - "run nandargs; " \ -- "nand read ${fdtaddr} NAND.u-boot-spl-os; " \ - "nand read ${loadaddr} NAND.kernel; " \ -- "bootz ${loadaddr} - ${fdtaddr}\0" -+ "bootm ${loadaddr}\0" - #else - #define NANDARGS "" - #endif -@@ -70,11 +69,9 @@ - #ifndef CONFIG_SPL_BUILD - #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" \ -+ "bootfile=grub/arm-uboot/core.img\0" \ - "console=ttyO0,115200n8\0" \ - "partitions=" \ - "uuid_disk=${uuid_gpt_disk};" \ -@@ -98,7 +95,7 @@ - "${optargs} " \ - "root=${spiroot} " \ - "rootfstype=${spirootfstype}\0" \ -- "bootenv=uEnv.txt\0" \ -+ "bootenv=uboot-grub-am335x_evm/uEnv.txt\0" \ - "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ - "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ - "source ${loadaddr}\0" \ -@@ -111,21 +108,8 @@ - "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" \ -+ "bootm ${loadaddr}; " \ - "mmcboot=mmc dev ${mmcdev}; " \ - "if mmc rescan; then " \ - "echo SD/MMC found on device ${mmcdev};" \ -@@ -149,28 +133,16 @@ - "run spiargs; " \ - "sf probe ${spibusno}:0; " \ - "sf read ${loadaddr} ${spisrcaddr} ${spiimgsize}; " \ -- "bootz ${loadaddr}\0" \ -+ "bootm ${loadaddr}\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" \ -+ "bootm ${loadaddr} ${rdaddr}\0" \ - NANDARGS \ - NETARGS \ - DFUARGS - #endif - - #define CONFIG_BOOTCOMMAND \ -- "run findfdt; " \ - "run mmcboot;" \ - "setenv mmcdev 1; " \ - "setenv bootpart 1:2; " \ -@@ -379,7 +351,6 @@ - #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 raw 0 3751936\0" \ |