diff options
| author | John Klug <john.klug@multitech.com> | 2021-09-16 08:10:47 -0500 |
|---|---|---|
| committer | John Klug <john.klug@multitech.com> | 2021-12-29 08:24:06 -0600 |
| commit | 567ffcdd492c1553f8b518c49d2bb6ea4ca50e90 (patch) | |
| tree | 9deb523c8e3f0048e12e84e8ffdb544390cfedd1 /recipes-bsp/u-boot | |
| parent | cd5e41c79ee353cd30927fb4109b25c3538cab89 (diff) | |
| download | meta-multitech-atmel-567ffcdd492c1553f8b518c49d2bb6ea4ca50e90.tar.gz meta-multitech-atmel-567ffcdd492c1553f8b518c49d2bb6ea4ca50e90.tar.bz2 meta-multitech-atmel-567ffcdd492c1553f8b518c49d2bb6ea4ca50e90.zip | |
Random MAC for EEPROM not written to yet
Diffstat (limited to 'recipes-bsp/u-boot')
| -rw-r--r-- | recipes-bsp/u-boot/u-boot-2016.09.01/mtrv1.patch | 32 | ||||
| -rw-r--r-- | recipes-bsp/u-boot/u-boot.inc | 2 |
2 files changed, 17 insertions, 17 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 49cb435..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 @@ -1,8 +1,7 @@ -diff --git a/board/atmel/at91sam9x5ek/at91sam9x5ek.c b/board/atmel/at91sam9x5ek/at91sam9x5ek.c -index b0d440d..5640cef 100644 ---- a/board/atmel/at91sam9x5ek/at91sam9x5ek.c -+++ b/board/atmel/at91sam9x5ek/at91sam9x5ek.c -@@ -44,7 +44,8 @@ static void at91sam9x5ek_nand_hw_init(void) +diff -Naru orig/board/atmel/at91sam9x5ek/at91sam9x5ek.c new/board/atmel/at91sam9x5ek/at91sam9x5ek.c +--- orig/board/atmel/at91sam9x5ek/at91sam9x5ek.c 2021-09-16 07:44:13.962787166 -0500 ++++ new/board/atmel/at91sam9x5ek/at91sam9x5ek.c 2021-09-16 07:50:11.414794371 -0500 +@@ -44,7 +44,8 @@ csa = readl(&matrix->ebicsa); csa |= AT91_MATRIX_EBI_CS3A_SMC_SMARTMEDIA; /* NAND flash on D16 */ @@ -12,7 +11,7 @@ index b0d440d..5640cef 100644 /* Configure IO drive */ csa &= ~AT91_MATRIX_EBI_EBI_IOSR_NORMAL; -@@ -256,6 +257,9 @@ int board_early_init_f(void) +@@ -256,6 +257,9 @@ int board_init(void) { @@ -22,7 +21,7 @@ index b0d440d..5640cef 100644 /* arch number of AT91SAM9X5EK-Board */ gd->bd->bi_arch_number = MACH_TYPE_AT91SAM9X5EK; -@@ -362,4 +366,61 @@ void mem_init(void) +@@ -362,4 +366,62 @@ /* DDRAM2 Controller initialize */ ddr2_init(ATMEL_BASE_DDRSDRC, ATMEL_BASE_CS1, &ddr2); } @@ -79,26 +78,27 @@ index b0d440d..5640cef 100644 + + /* set MAC address from EEPROM if read successful */ + if (board_get_enetaddr(enetaddr)) { -+ eth_setenv_enetaddr("ethaddr", enetaddr); ++ /* Use random MAC address */ ++ /* eth_setenv_enetaddr("ethaddr", enetaddr); */ + } + + return 0; +} -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 @@ +diff -Naru orig/configs/at91sam9x5ek_nandflash_defconfig new/configs/at91sam9x5ek_nandflash_defconfig +--- 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_NET_RANDOM_ETHADDR=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 -+++ b/include/configs/at91sam9x5ek.h +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 @@ -9,8 +9,10 @@ #ifndef __CONFIG_H__ #define __CONFIG_H__ diff --git a/recipes-bsp/u-boot/u-boot.inc b/recipes-bsp/u-boot/u-boot.inc index 8854181..800c48e 100644 --- a/recipes-bsp/u-boot/u-boot.inc +++ b/recipes-bsp/u-boot/u-boot.inc @@ -4,7 +4,7 @@ SECTION = "bootloaders" PROVIDES = "virtual/bootloader" # New U-Boot with suppressed version. -PR="m3" +PR="m4" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" |