summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSerhii Voloshynov <serhii.voloshynov@globallogic.com>2023-02-03 15:46:53 +0200
committerJohn Klug <john.klug@multitech.com>2023-02-03 09:27:42 -0600
commit6bc97914f155f72de8c4646c4fab339d3ac283b6 (patch)
tree288d7669c731d661d88edf3320c5900d1cf99223
parentf65672a31c73f069e487106c7454fbceb4ff3f60 (diff)
downloadmeta-multitech-atmel-6bc97914f155f72de8c4646c4fab339d3ac283b6.tar.gz
meta-multitech-atmel-6bc97914f155f72de8c4646c4fab339d3ac283b6.tar.bz2
meta-multitech-atmel-6bc97914f155f72de8c4646c4fab339d3ac283b6.zip
Revert "Update mtrv1 patch"
This reverts commit 11e1b9c4483d0aec8ff6631588b6adc04d063b13.
-rw-r--r--recipes-bsp/u-boot/u-boot-2016.09.01/mtrv1.patch19
1 files changed, 9 insertions, 10 deletions
diff --git a/recipes-bsp/u-boot/u-boot-2016.09.01/mtrv1.patch b/recipes-bsp/u-boot/u-boot-2016.09.01/mtrv1.patch
index 46208d5..0616680 100644
--- a/recipes-bsp/u-boot/u-boot-2016.09.01/mtrv1.patch
+++ b/recipes-bsp/u-boot/u-boot-2016.09.01/mtrv1.patch
@@ -85,18 +85,17 @@ diff -Naru orig/board/atmel/at91sam9x5ek/at91sam9x5ek.c new/board/atmel/at91sam9
+ return 0;
+}
diff -Naru orig/configs/at91sam9x5ek_nandflash_defconfig new/configs/at91sam9x5ek_nandflash_defconfig
---- orig/configs/at91sam9x5ek_nandflash_defconfig 2022-11-18 10:42:42.778249577 -0600
-+++ new/configs/at91sam9x5ek_nandflash_defconfig 2022-11-18 10:48:03.694242067 -0600
-@@ -315,7 +315,8 @@
- CONFIG_CMD_MMC=y
- # CONFIG_CMD_SF is not set
- # CONFIG_CMD_SPI is not set
+--- orig/configs/at91sam9x5ek_nandflash_defconfig 2021-09-16 07:44:32.342787536 -0500
++++ new/configs/at91sam9x5ek_nandflash_defconfig 2021-09-16 07:48:36.378792455 -0500
+@@ -30,7 +30,7 @@
+ CONFIG_CMD_NAND=y
+ CONFIG_CMD_BOOTZ=y
+ CONFIG_CMD_MII=y
-CONFIG_CMD_I2C=y
-+# CONFIG_CMD_I2C is not set
+CONFIG_NET_RANDOM_ETHADDR=y
- CONFIG_CMD_USB=y
- # CONFIG_CMD_DFU is not set
- # CONFIG_CMD_USB_MASS_STORAGE is not set
+
+ # The config option CONFIG_SILENT_CONSOLE can be used to quiet messages
+ # on the console. If the option has been enabled, the output can be
diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek.h
--- orig/include/configs/at91sam9x5ek.h 2021-09-16 07:45:26.598788630 -0500
+++ new/include/configs/at91sam9x5ek.h 2021-09-16 07:47:04.478790603 -0500