From df10180b980c248e5c649051c9535fd640f75962 Mon Sep 17 00:00:00 2001 From: John Klug Date: Fri, 17 Jun 2022 20:38:45 -0500 Subject: Get SD card boot automated from U-Boot --- .../u-boot/u-boot-2016.09.01/configfactory.patch | 9 +++---- recipes-bsp/u-boot/u-boot-2016.09.01/mtcdtsd.patch | 31 +++++++++++++--------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/recipes-bsp/u-boot/u-boot-2016.09.01/configfactory.patch b/recipes-bsp/u-boot/u-boot-2016.09.01/configfactory.patch index cfda8cb..c999469 100644 --- a/recipes-bsp/u-boot/u-boot-2016.09.01/configfactory.patch +++ b/recipes-bsp/u-boot/u-boot-2016.09.01/configfactory.patch @@ -1,6 +1,6 @@ diff -Naru orig/configs/at91sam9x5ek_nandflash_defconfig new/configs/at91sam9x5ek_nandflash_defconfig ---- orig/configs/at91sam9x5ek_nandflash_defconfig 2022-05-11 17:23:26.522032483 -0500 -+++ new/configs/at91sam9x5ek_nandflash_defconfig 2022-05-23 12:37:49.630171035 -0500 +--- orig/configs/at91sam9x5ek_nandflash_defconfig 2022-06-17 18:49:55.855101752 -0500 ++++ new/configs/at91sam9x5ek_nandflash_defconfig 2022-06-17 18:53:11.239097179 -0500 @@ -1,25 +1,639 @@ +# +# Automatically generated file; DO NOT EDIT. @@ -317,11 +317,10 @@ diff -Naru orig/configs/at91sam9x5ek_nandflash_defconfig new/configs/at91sam9x5e +# CONFIG_CMD_LOADB is not set +# CONFIG_CMD_LOADS is not set # CONFIG_CMD_FLASH is not set --CONFIG_CMD_MMC=y --CONFIG_CMD_SF=y +# CONFIG_CMD_ARMFLASH is not set -+# CONFIG_CMD_MMC is not set +# CONFIG_CMD_NAND is not set + CONFIG_CMD_MMC=y +-CONFIG_CMD_SF=y +# CONFIG_CMD_SF is not set +# CONFIG_CMD_SPI is not set +CONFIG_CMD_I2C=y diff --git a/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdtsd.patch b/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdtsd.patch index f2edd89..3ccaf87 100644 --- a/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdtsd.patch +++ b/recipes-bsp/u-boot/u-boot-2016.09.01/mtcdtsd.patch @@ -1,6 +1,6 @@ diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek.h ---- orig/include/configs/at91sam9x5ek.h 2022-05-23 11:05:42.510300376 -0500 -+++ new/include/configs/at91sam9x5ek.h 2022-05-23 11:35:48.758258108 -0500 +--- orig/include/configs/at91sam9x5ek.h 2022-06-17 18:30:03.683129650 -0500 ++++ new/include/configs/at91sam9x5ek.h 2022-06-17 19:38:08.647034056 -0500 @@ -9,9 +9,12 @@ #ifndef __CONFIG_H__ #define __CONFIG_H__ @@ -15,16 +15,17 @@ diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek. /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 -@@ -26,6 +29,8 @@ +@@ -26,6 +29,9 @@ #define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_DISPLAY_CPUINFO ++#define CONFIG_SYS_USE_MMC +#define CONFIG_MISC_INIT_R /* enable platform-dependent misc_init_r() */ + /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ #define CONFIG_AT91_GPIO -@@ -36,6 +41,8 @@ +@@ -36,6 +42,8 @@ #define CONFIG_USART_ID ATMEL_ID_SYS /* LCD */ @@ -33,7 +34,7 @@ diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek. #define CONFIG_LCD #define LCD_BPP LCD_COLOR16 #define LCD_OUTPUT_BPP 24 -@@ -46,7 +53,13 @@ +@@ -46,7 +54,13 @@ #define CONFIG_ATMEL_HLCD #define CONFIG_ATMEL_LCD_RGB565 #define CONFIG_SYS_CONSOLE_IS_IN_ENV @@ -47,7 +48,7 @@ diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek. /* * BOOTP options -@@ -60,10 +73,10 @@ +@@ -60,10 +74,10 @@ #define CONFIG_SYS_NO_FLASH /* @@ -61,7 +62,7 @@ diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek. /* * define CONFIG_USB_EHCI to enable USB Hi-Speed (aka 2.0) * NB: in this case, USB 1.1 devices won't be recognized. -@@ -72,7 +85,7 @@ +@@ -72,7 +86,7 @@ /* SDRAM */ #define CONFIG_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x20000000 @@ -70,7 +71,7 @@ diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek. #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_SDRAM_BASE + 4 * 1024 - GENERATED_GBL_DATA_SIZE) -@@ -94,13 +107,30 @@ +@@ -94,13 +108,30 @@ /* our CLE is AD22 */ #define CONFIG_SYS_NAND_MASK_CLE (1 << 22) #define CONFIG_SYS_NAND_ENABLE_PIN AT91_PIN_PD4 @@ -103,7 +104,7 @@ diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek. #define CONFIG_CMD_NAND_TRIMFFS -@@ -147,20 +177,36 @@ +@@ -147,20 +178,36 @@ #endif #endif @@ -145,7 +146,13 @@ diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek. #elif defined(CONFIG_SYS_USE_SPIFLASH) /* bootstrap + u-boot + env + linux in spi flash */ #define CONFIG_ENV_IS_IN_SPI_FLASH -@@ -197,6 +243,9 @@ +@@ -192,11 +239,15 @@ + #endif + + #ifdef CONFIG_SYS_USE_MMC ++#define CONFIG_BOOTCOMMAND "load mmc 0:1 ${loadaddr} uImage; bootm ${loadaddr}" + #define CONFIG_BOOTARGS "mem=128M console=ttyS0,115200 " \ + "mtdparts=atmel_nand:" \ "8M(bootstrap/uboot/kernel)ro,-(rootfs) " \ "root=/dev/mmcblk0p2 " \ "rw rootfstype=ext4 rootwait" @@ -155,7 +162,7 @@ diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek. #else #define CONFIG_BOOTARGS \ "console=ttyS0,115200 earlyprintk " \ -@@ -264,7 +313,7 @@ +@@ -264,7 +315,7 @@ #define CONFIG_SYS_NAND_OOBSIZE 64 #define CONFIG_SYS_NAND_BLOCK_SIZE 0x20000 #define CONFIG_SYS_NAND_BAD_BLOCK_POS 0x0 @@ -164,7 +171,7 @@ diff -Naru orig/include/configs/at91sam9x5ek.h new/include/configs/at91sam9x5ek. #elif CONFIG_SYS_USE_SPIFLASH #define CONFIG_SPL_SPI_SUPPORT -@@ -274,4 +323,21 @@ +@@ -274,4 +325,21 @@ #endif -- cgit v1.2.3