From 23ab8038a7fe008492b514c5cb3a3903f0174900 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sun, 28 Apr 2019 19:31:14 +0200 Subject: [PATCH] [ meson64 ] re-enable (adjusted) patch --- ...boot-meson64-support-old-bootscripts.patch | 19 +++++++++++++++++++ ...on64-support-old-bootscripts.patch.disable | 19 ------------------- 2 files changed, 19 insertions(+), 19 deletions(-) create mode 100644 patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch delete mode 100644 patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch.disable diff --git a/patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch b/patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch new file mode 100644 index 0000000000..b461d612ea --- /dev/null +++ b/patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch @@ -0,0 +1,19 @@ +diff --git a/include/configs/meson64.h b/include/configs/meson64.h +index d82a674..8e9a724 100644 +--- a/include/configs/meson64.h ++++ b/include/configs/meson64.h +@@ -83,10 +83,14 @@ + "stdout=" STDOUT_CFG "\0" \ + "stderr=" STDOUT_CFG "\0" \ + "fdt_addr_r=0x08008000\0" \ ++ "dtb_mem_addr=0x01000000\0" \ + "scriptaddr=0x08000000\0" \ + "kernel_addr_r=0x08080000\0" \ + "pxefile_addr_r=0x01080000\0" \ ++ "loadaddr=0x01080000\0" \ + "ramdisk_addr_r=0x13000000\0" \ ++ "initrd_start=0x13000000\0" \ ++ "bloader=ext4load mmc 0:1\0" \ + "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ + BOOTENV + #endif diff --git a/patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch.disable b/patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch.disable deleted file mode 100644 index 4477bf1ed7..0000000000 --- a/patch/u-boot/u-boot-meson64/u-boot-meson64-support-old-bootscripts.patch.disable +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/include/configs/meson-gx-common.h b/include/configs/meson-gx-common.h -index 5794bc0..6f45a5c 100644 ---- a/include/configs/meson-gx-common.h -+++ b/include/configs/meson-gx-common.h -@@ -35,10 +35,14 @@ - - #define CONFIG_EXTRA_ENV_SETTINGS \ - "fdt_addr_r=0x01000000\0" \ -+ "dtb_mem_addr=0x01000000\0" \ - "scriptaddr=0x1f000000\0" \ - "kernel_addr_r=0x01080000\0" \ - "pxefile_addr_r=0x01080000\0" \ -+ "loadaddr=0x01080000\0" \ - "ramdisk_addr_r=0x13000000\0" \ -+ "initrd_start=0x13000000\0" \ -+ "bloader=ext4load mmc 0:1\0" \ - MESON_FDTFILE_SETTING \ - BOOTENV -