diff options
| author | John Klug <john.klug@multitech.com> | 2019-02-13 11:50:01 -0600 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2019-02-13 11:50:01 -0600 |
| commit | 9d0e9f7b173e61a3efd2b177cfe953bd0cc4923d (patch) | |
| tree | ca48135708877a459944f9da35e34ac964578c37 /recipes-bsp/u-boot | |
| parent | 9b7ddec2d027f4f76dd1ad8ba28bd6c2731a9c3e (diff) | |
| download | meta-multitech-atmel-9d0e9f7b173e61a3efd2b177cfe953bd0cc4923d.tar.gz meta-multitech-atmel-9d0e9f7b173e61a3efd2b177cfe953bd0cc4923d.tar.bz2 meta-multitech-atmel-9d0e9f7b173e61a3efd2b177cfe953bd0cc4923d.zip | |
Silent boot patch broke the context for the mtr and mtrv1 I2C removal patches
Diffstat (limited to 'recipes-bsp/u-boot')
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-2016.09.01/mtr.patch | 12 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-2016.09.01/mtrv1.patch | 12 |
2 files changed, 14 insertions, 10 deletions
diff --git a/recipes-bsp/u-boot/u-boot-2016.09.01/mtr.patch b/recipes-bsp/u-boot/u-boot-2016.09.01/mtr.patch index 3ef68f2..176e590 100644 --- a/recipes-bsp/u-boot/u-boot-2016.09.01/mtr.patch +++ b/recipes-bsp/u-boot/u-boot-2016.09.01/mtr.patch @@ -83,15 +83,17 @@ index b0d440d..13cc9a3 100644 + return 0; +} + -diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig -index c276795..9ba415d 100644 ---- a/configs/at91sam9x5ek_nandflash_defconfig -+++ b/configs/at91sam9x5ek_nandflash_defconfig -@@ -31,4 +31,3 @@ CONFIG_CMD_USB=y +diff -Naru a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig +--- a/configs/at91sam9x5ek_nandflash_defconfig 2019-02-13 11:21:57.000000000 -0600 ++++ b/configs/at91sam9x5ek_nandflash_defconfig 2019-02-13 11:27:11.463114488 -0600 +@@ -31,7 +31,6 @@ CONFIG_CMD_NAND=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_MII=y -CONFIG_CMD_I2C=y + + # 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 --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 637c403..693feee 100644 --- a/include/configs/at91sam9x5ek.h 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 53b4995..49cb435 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 @@ -84,15 +84,17 @@ index b0d440d..5640cef 100644 + + return 0; +} -diff --git a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig -index c276795..9ba415d 100644 ---- a/configs/at91sam9x5ek_nandflash_defconfig -+++ b/configs/at91sam9x5ek_nandflash_defconfig -@@ -31,4 +31,3 @@ CONFIG_CMD_USB=y +diff -Naru a/configs/at91sam9x5ek_nandflash_defconfig b/configs/at91sam9x5ek_nandflash_defconfig +--- a/configs/at91sam9x5ek_nandflash_defconfig 2019-02-13 11:21:57.000000000 -0600 ++++ b/configs/at91sam9x5ek_nandflash_defconfig 2019-02-13 11:27:11.463114488 -0600 +@@ -31,7 +31,6 @@ CONFIG_CMD_NAND=y CONFIG_CMD_BOOTZ=y CONFIG_CMD_MII=y -CONFIG_CMD_I2C=y + + # 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 --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 637c403..eff48d6 100644 --- a/include/configs/at91sam9x5ek.h |