From 2499c1d49ac919d889929516ccf0b09b77788b00 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Tue, 24 Sep 2019 07:53:22 +0300 Subject: [PATCH] Remove all custom patches and start fresh CONFIG_PREBOOT might need re-work, thus let's start fresh to see check uboot environment before changes. Signed-off-by: David Abdurachmanov --- fu540-boot-mmc-pxe.patch | 13 ------------- sifive-fu540-remove-CONFIG_PREBOOT.patch | 13 ------------- uboot-tools.spec | 4 ---- 3 files changed, 30 deletions(-) delete mode 100644 fu540-boot-mmc-pxe.patch delete mode 100644 sifive-fu540-remove-CONFIG_PREBOOT.patch diff --git a/fu540-boot-mmc-pxe.patch b/fu540-boot-mmc-pxe.patch deleted file mode 100644 index cc06b5c..0000000 --- a/fu540-boot-mmc-pxe.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h -index ba4aa065..7eedc765 100644 ---- a/include/configs/sifive-fu540.h -+++ b/include/configs/sifive-fu540.h -@@ -26,6 +26,8 @@ - #define CONFIG_ENV_SIZE SZ_128K - - #define BOOT_TARGET_DEVICES(func) \ -+ func(MMC, mmc, 0) \ -+ func(PXE, pxe, na) \ - func(DHCP, dhcp, na) - - #include diff --git a/sifive-fu540-remove-CONFIG_PREBOOT.patch b/sifive-fu540-remove-CONFIG_PREBOOT.patch deleted file mode 100644 index a7b941d..0000000 --- a/sifive-fu540-remove-CONFIG_PREBOOT.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/include/configs/sifive-fu540.h b/include/configs/sifive-fu540.h -index 676db59..7eedc76 100644 ---- a/include/configs/sifive-fu540.h -+++ b/include/configs/sifive-fu540.h -@@ -42,8 +42,4 @@ - "ramdisk_addr_r=0x88300000\0" \ - BOOTENV - --#define CONFIG_PREBOOT \ -- "setenv fdt_addr ${fdtcontroladdr};" \ -- "fdt addr ${fdtcontroladdr};" -- - #endif /* __CONFIG_H */ diff --git a/uboot-tools.spec b/uboot-tools.spec index f50cac2..90c9356 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -29,10 +29,6 @@ Patch8: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch Patch9: arm-tegra-defaine-fdtfile-for-all-devices.patch Patch10: env-fix-build-error-for-envtools.patch -Patch20: sifive-fu540-remove-CONFIG_PREBOOT.patch -Patch21: env-fix-build-error-for-envtools.patch -Patch22: fu540-boot-mmc-pxe.patch - BuildRequires: bc BuildRequires: dtc BuildRequires: make