update patches for Uboot-bananaPro

5 files changed, 72 insertions, 119 deletions

diff --git a/platforms/bananaPro/patch/bananapro_1_Disable_default_distro.patch b/platforms/bananaPro/patch/bananapro_1_Disable_default_distro.patch
index 1125328..9fc06d0 100644
--- a/platforms/bananaPro/patch/bananapro_1_Disable_default_distro.patch
+++ b/platforms/bananaPro/patch/bananapro_1_Disable_default_distro.patch
@@ -1,19 +1,11 @@
-*** ./.config	2020-08-25 21:33:04.910903793 +0200
---- ./.config	2020-08-25 21:24:05.614962532 +0200
-*************** CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-*** 311,317 ****
-  # CONFIG_SPL_OPTIMIZE_INLINING is not set
-  CONFIG_CC_HAS_ASM_INLINE=y
-  # CONFIG_XEN is not set
-! # CONFIG_DISTRO_DEFAULTS is not set
-  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-  # CONFIG_SYS_BOOT_GET_CMDLINE is not set
-  # CONFIG_SYS_BOOT_GET_KBD is not set
---- 311,317 ----
-  # CONFIG_SPL_OPTIMIZE_INLINING is not set
-  CONFIG_CC_HAS_ASM_INLINE=y
-  # CONFIG_XEN is not set
-! CONFIG_DISTRO_DEFAULTS=y
-  CONFIG_ENV_VARS_UBOOT_CONFIG=y
-  # CONFIG_SYS_BOOT_GET_CMDLINE is not set
-  # CONFIG_SYS_BOOT_GET_KBD is not set
+--- ./.config	2020-09-08 08:33:38.032449525 +0200
++++ ./.config	2020-09-08 08:33:49.117534240 +0200
+@@ -311,7 +311,7 @@
+ # CONFIG_SPL_OPTIMIZE_INLINING is not set
+ CONFIG_CC_HAS_ASM_INLINE=y
+ # CONFIG_XEN is not set
+-CONFIG_DISTRO_DEFAULTS=y
++# CONFIG_DISTRO_DEFAULTS is not set
+ CONFIG_ENV_VARS_UBOOT_CONFIG=y
+ # CONFIG_SYS_BOOT_GET_CMDLINE is not set
+ # CONFIG_SYS_BOOT_GET_KBD is not set
diff --git a/platforms/bananaPro/patch/bananapro_2_Disable_USB_mass_storage.patch b/platforms/bananaPro/patch/bananapro_2_Disable_USB_mass_storage.patch
index 1cb9d49..36164e1 100644
--- a/platforms/bananaPro/patch/bananapro_2_Disable_USB_mass_storage.patch
+++ b/platforms/bananaPro/patch/bananapro_2_Disable_USB_mass_storage.patch
@@ -1,19 +1,11 @@
-*** ./.config	2020-08-28 09:08:36.998081201 +0200
---- ./.config	2020-08-26 22:52:06.053194222 +0200
-*************** CONFIG_USB_OHCI_GENERIC=y
-*** 1302,1308 ****
-  #
-  # USB peripherals
-  #
-! # CONFIG_USB_STORAGE is not set
-  CONFIG_USB_KEYBOARD=y
-  CONFIG_USB_KEYBOARD_FN_KEYS=y
-  # CONFIG_SYS_USB_EVENT_POLL is not set
---- 1302,1308 ----
-  #
-  # USB peripherals
-  #
-! CONFIG_USB_STORAGE=y
-  CONFIG_USB_KEYBOARD=y
-  CONFIG_USB_KEYBOARD_FN_KEYS=y
-  # CONFIG_SYS_USB_EVENT_POLL is not set
+--- ./.config	2020-09-08 13:34:57.409722071 +0200
++++ ./.config	2020-09-08 13:35:04.873391266 +0200
+@@ -1416,7 +1416,7 @@
+ #
+ # USB peripherals
+ #
+-CONFIG_USB_STORAGE=y
++# CONFIG_USB_STORAGE is not set
+ CONFIG_USB_KEYBOARD=y
+ CONFIG_USB_KEYBOARD_FN_KEYS=y
+ # CONFIG_SYS_USB_EVENT_POLL is not set
diff --git a/platforms/bananaPro/patch/bananapro_3_Reduce_choice_boot_to_1s.patch b/platforms/bananaPro/patch/bananapro_3_Reduce_choice_boot_to_1s.patch
index f8d932c..835770b 100644
--- a/platforms/bananaPro/patch/bananapro_3_Reduce_choice_boot_to_1s.patch
+++ b/platforms/bananaPro/patch/bananapro_3_Reduce_choice_boot_to_1s.patch
@@ -1,19 +1,11 @@
-*** ./.config	2020-08-25 16:48:35.905594140 +0200
---- ./.config	2020-08-25 16:41:39.209269545 +0200
-*************** CONFIG_BOOTSTAGE_STASH_SIZE=0x1000
-*** 377,383 ****
-  # CONFIG_SATA_BOOT is not set
-  # CONFIG_SD_BOOT is not set
-  # CONFIG_SPI_BOOT is not set
-! CONFIG_BOOTDELAY=1
-  # CONFIG_USE_BOOTARGS is not set
-  CONFIG_USE_BOOTCOMMAND=y
-  CONFIG_BOOTCOMMAND="run distro_bootcmd"
---- 377,383 ----
-  # CONFIG_SATA_BOOT is not set
-  # CONFIG_SD_BOOT is not set
-  # CONFIG_SPI_BOOT is not set
-! CONFIG_BOOTDELAY=2
-  # CONFIG_USE_BOOTARGS is not set
-  CONFIG_USE_BOOTCOMMAND=y
-  CONFIG_BOOTCOMMAND="run distro_bootcmd"
+--- ./.config	2020-09-08 13:37:29.571109115 +0200
++++ ./.config	2020-09-08 13:37:45.608244905 +0200
+@@ -377,7 +377,7 @@
+ # CONFIG_SATA_BOOT is not set
+ # CONFIG_SD_BOOT is not set
+ # CONFIG_SPI_BOOT is not set
+-CONFIG_BOOTDELAY=2
++CONFIG_BOOTDELAY=1
+ # CONFIG_USE_BOOTARGS is not set
+ CONFIG_USE_BOOTCOMMAND=y
+ CONFIG_BOOTCOMMAND="run distro_bootcmd"
diff --git a/platforms/bananaPro/patch/bananapro_4_change_default_boot_device_to_mmc.patch b/platforms/bananaPro/patch/bananapro_4_change_default_boot_device_to_mmc.patch
index eea7670..e7f5c5c 100644
--- a/platforms/bananaPro/patch/bananapro_4_change_default_boot_device_to_mmc.patch
+++ b/platforms/bananaPro/patch/bananapro_4_change_default_boot_device_to_mmc.patch
@@ -1,19 +1,11 @@
-*** ./.config	2020-08-25 16:50:23.281984798 +0200
---- ./.config	2020-08-25 16:48:35.905594140 +0200
-*************** CONFIG_BOOTSTAGE_STASH_SIZE=0x1000
-*** 380,386 ****
-  CONFIG_BOOTDELAY=1
-  # CONFIG_USE_BOOTARGS is not set
-  CONFIG_USE_BOOTCOMMAND=y
-! CONFIG_BOOTCOMMAND="run bootcmd_mmc0"
-  CONFIG_USE_PREBOOT=y
-  CONFIG_PREBOOT=""
-  
---- 380,386 ----
-  CONFIG_BOOTDELAY=1
-  # CONFIG_USE_BOOTARGS is not set
-  CONFIG_USE_BOOTCOMMAND=y
-! CONFIG_BOOTCOMMAND="run distro_bootcmd"
-  CONFIG_USE_PREBOOT=y
-  CONFIG_PREBOOT=""
-  
+--- ./.config	2020-09-08 13:38:25.373836843 +0200
++++ ./.config	2020-09-08 13:38:34.818026499 +0200
+@@ -380,7 +380,7 @@
+ CONFIG_BOOTDELAY=1
+ # CONFIG_USE_BOOTARGS is not set
+ CONFIG_USE_BOOTCOMMAND=y
+-CONFIG_BOOTCOMMAND="run distro_bootcmd"
++CONFIG_BOOTCOMMAND="run bootcmd_mmc0"
+ CONFIG_USE_PREBOOT=y
+ CONFIG_PREBOOT=""
+ 
diff --git a/platforms/bananaPro/patch/bananapro_5_Switch_ENV_From_Fat_to_Ext4.patch b/platforms/bananaPro/patch/bananapro_5_Switch_ENV_From_Fat_to_Ext4.patch
index 77230c5..d3dbaeb 100644
--- a/platforms/bananaPro/patch/bananapro_5_Switch_ENV_From_Fat_to_Ext4.patch
+++ b/platforms/bananaPro/patch/bananapro_5_Switch_ENV_From_Fat_to_Ext4.patch
@@ -1,43 +1,28 @@
-*** ./.config	2020-08-25 21:22:39.013961045 +0200
---- ./.config	2020-08-25 21:19:11.931937001 +0200
-*************** CONFIG_SAVEENV=y
-*** 801,818 ****
-  # CONFIG_ENV_OVERWRITE is not set
-  # CONFIG_ENV_IS_NOWHERE is not set
-  # CONFIG_ENV_IS_IN_EEPROM is not set
-! # CONFIG_ENV_IS_IN_FAT is not set
-! CONFIG_ENV_IS_IN_EXT4=y
-  # CONFIG_ENV_IS_IN_FLASH is not set
-  # CONFIG_ENV_IS_IN_MMC is not set
-  # CONFIG_ENV_IS_IN_NAND is not set
-  # CONFIG_ENV_IS_IN_NVRAM is not set
-  # CONFIG_ENV_IS_IN_ONENAND is not set
-  # CONFIG_ENV_IS_IN_REMOTE is not set
-! CONFIG_ENV_EXT4_INTERFACE="mmc"
-! CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
-! CONFIG_ENV_EXT4_FILE="/boot/uboot.env"
-  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-  # CONFIG_USE_DEFAULT_ENV_FILE is not set
-  # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
-  # CONFIG_ENV_APPEND is not set
---- 801,820 ----
-  # CONFIG_ENV_OVERWRITE is not set
-  # CONFIG_ENV_IS_NOWHERE is not set
-  # CONFIG_ENV_IS_IN_EEPROM is not set
-! CONFIG_ENV_IS_IN_FAT=y
-! # CONFIG_ENV_IS_IN_EXT4 is not set
-  # CONFIG_ENV_IS_IN_FLASH is not set
-  # CONFIG_ENV_IS_IN_MMC is not set
-  # CONFIG_ENV_IS_IN_NAND is not set
-  # CONFIG_ENV_IS_IN_NVRAM is not set
-  # CONFIG_ENV_IS_IN_ONENAND is not set
-  # CONFIG_ENV_IS_IN_REMOTE is not set
-! CONFIG_ENV_FAT_INTERFACE="mmc"
-! CONFIG_ENV_FAT_DEVICE_AND_PART="0:auto"
-! CONFIG_ENV_FAT_FILE="uboot.env"
-  CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-+ CONFIG_SYS_MMC_ENV_DEV=0
-+ CONFIG_SYS_MMC_ENV_PART=0
-  # CONFIG_USE_DEFAULT_ENV_FILE is not set
-  # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
-  # CONFIG_ENV_APPEND is not set
+--- ./.config	2020-09-08 13:38:57.052540768 +0200
++++ ./.config	2020-09-08 13:39:06.204778656 +0200
+@@ -828,20 +828,18 @@
+ # CONFIG_ENV_OVERWRITE is not set
+ # CONFIG_ENV_IS_NOWHERE is not set
+ # CONFIG_ENV_IS_IN_EEPROM is not set
+-CONFIG_ENV_IS_IN_FAT=y
+-# CONFIG_ENV_IS_IN_EXT4 is not set
++# CONFIG_ENV_IS_IN_FAT is not set
++CONFIG_ENV_IS_IN_EXT4=y
+ # CONFIG_ENV_IS_IN_FLASH is not set
+ # CONFIG_ENV_IS_IN_MMC is not set
+ # CONFIG_ENV_IS_IN_NAND is not set
+ # CONFIG_ENV_IS_IN_NVRAM is not set
+ # CONFIG_ENV_IS_IN_ONENAND is not set
+ # CONFIG_ENV_IS_IN_REMOTE is not set
+-CONFIG_ENV_FAT_INTERFACE="mmc"
+-CONFIG_ENV_FAT_DEVICE_AND_PART="0:auto"
+-CONFIG_ENV_FAT_FILE="uboot.env"
++CONFIG_ENV_EXT4_INTERFACE="mmc"
++CONFIG_ENV_EXT4_DEVICE_AND_PART="0:auto"
++CONFIG_ENV_EXT4_FILE="/boot/uboot.env"
+ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
+-CONFIG_SYS_MMC_ENV_DEV=0
+-CONFIG_SYS_MMC_ENV_PART=0
+ # CONFIG_USE_DEFAULT_ENV_FILE is not set
+ # CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG is not set
+ # CONFIG_ENV_APPEND is not set