From 9393cb81acc34d1bd27cc921d8d98e618fb74662 Mon Sep 17 00:00:00 2001
From: guowenxue <guowenxue@gmail.com>
Date: Fri, 23 Aug 2019 00:14:04 +0800
Subject: [PATCH] update u-boot,linux kernel to compile dtb and zImage into single idb file; update bootstrap,u-boot,linux kernel nandflash partition; update sama5d4_xplained_loader files in folder
---
linux-bsp/patches/u-boot-at91-sama5d4.patch | 61 +++++++++++++++---------------
1 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/linux-bsp/patches/u-boot-at91-sama5d4.patch b/linux-bsp/patches/u-boot-at91-sama5d4.patch
index a20c947..24e8766 100644
--- a/linux-bsp/patches/u-boot-at91-sama5d4.patch
+++ b/linux-bsp/patches/u-boot-at91-sama5d4.patch
@@ -1,6 +1,6 @@
diff -Nuar u-boot-at91/build.sh u-boot-at91-sama5d4/build.sh
--- u-boot-at91/build.sh 1970-01-01 08:00:00.000000000 +0800
-+++ u-boot-at91-sama5d4/build.sh 2019-08-22 18:55:28.199236657 +0800
++++ u-boot-at91-sama5d4/build.sh 2019-08-22 19:29:07.323275389 +0800
@@ -0,0 +1,67 @@
+#!/bin/bash
+
@@ -71,7 +71,7 @@
+
diff -Nuar u-boot-at91/include/configs/sama5d4_xplained.h u-boot-at91-sama5d4/include/configs/sama5d4_xplained.h
--- u-boot-at91/include/configs/sama5d4_xplained.h 2019-08-04 21:52:13.000000000 +0800
-+++ u-boot-at91-sama5d4/include/configs/sama5d4_xplained.h 2019-08-22 16:37:32.807077915 +0800
++++ u-boot-at91-sama5d4/include/configs/sama5d4_xplained.h 2019-08-22 23:56:21.299582959 +0800
@@ -38,7 +38,7 @@
#define CONFIG_USART_BASE ATMEL_BASE_USART3
#define CONFIG_USART_ID ATMEL_ID_USART3
@@ -81,45 +81,48 @@
/*
* BOOTP options
-@@ -173,9 +173,9 @@
- #define CONFIG_ENV_OFFSET 0xc0000
- #define CONFIG_ENV_OFFSET_REDUND 0x100000
- #define CONFIG_ENV_SIZE 0x20000
+@@ -170,12 +170,10 @@
+ #elif CONFIG_SYS_USE_NANDFLASH
+ /* bootstrap + u-boot + env in nandflash */
+ #define CONFIG_ENV_IS_IN_NAND
+-#define CONFIG_ENV_OFFSET 0xc0000
+-#define CONFIG_ENV_OFFSET_REDUND 0x100000
+-#define CONFIG_ENV_SIZE 0x20000
-#define CONFIG_BOOTCOMMAND "nand read 0x21000000 0x180000 0x80000;" \
-+#define CONFIG_BOOTCOMMAND "nand read 0x21000000 0x180000 0x40000;" \
- "nand read 0x22000000 0x200000 0x600000;" \
+- "nand read 0x22000000 0x200000 0x600000;" \
- "bootz 0x22000000 - 0x21000000"
-+ "bootm 0x22000000 - 0x21000000"
++#define CONFIG_ENV_OFFSET 0xC0000
++#define CONFIG_ENV_SIZE 0x20000
++//#define CONFIG_ENV_OFFSET_REDUND 0xa0000
++#define CONFIG_BOOTCOMMAND "nand read 0x22000000 0x100000 0x700000; bootm 0x22000000"
#elif CONFIG_SYS_USE_MMC
/* bootstrap + u-boot + env in sd card */
#define CONFIG_ENV_IS_IN_FAT
-@@ -194,6 +194,37 @@
+@@ -194,6 +192,35 @@
"bootz 0x22000000 - 0x21000000"
#endif
+/* add by guowenxue, 2019.08.22 */
++#define CONFIG_FIT 1
+#define CONFIG_ENV_OVERWRITE 1
+#define CONFIG_ETHADDR 42:96:ab:be:a7:5e
+#define CONFIG_IPADDR 192.168.2.199
+#define CONFIG_SERVERIP 192.168.2.2
+
+
-+#define CONFIG_TFTPBOOT "tftp 0x22000000 linuxrom-sama5d4.bin && tftp 0x21000000 linuxrom-sama5d4.dtb; " \
-+ "bootm 0x22000000 - 0x21000000"
+
-+#define CONFIG_BBL "tftp 0x21000000 u-boot-sama5d4.bin && nand erase 0x40000 0x140000;" \
++#define CONFIG_TFTPBOOT "tftp 0x22000000 linuxrom-sama5d4.itb && bootm 0x22000000"
++
++#define CONFIG_BBL "tftp 0x21000000 u-boot-sama5d4.bin && nand erase 0x40000 0xC0000;" \
+ "nand write 0x21000000 0x40000 ${filesize}"
+
-+#define CONFIG_BDTB "tftp 0x21000000 linuxrom-sama5d4.dtb && nand erase 0x180000 0x80000; " \
-+ "nand write 0x21000000 0x180000 ${filesize}"
-+
-+#define CONFIG_BKR "tftp 0x22000000 linuxrom-sama5d4.bin && nand erase 0x200000 0x600000; " \
-+ "nand write 0x22000000 0x200000 ${filesize}"
++#define CONFIG_BKR "tftp 0x22000000 linuxrom-sama5d4.itb && nand erase 0x100000 0x700000; " \
++ "nand write 0x22000000 0x100000 ${filesize}"
+
+#define CONFIG_BFS "tftp 0x21000000 rootfs-sama5d4.ubi && nand erase 800000 c800000; " \
+ "nand write 0x21000000 800000 ${filesize}"
+
-+#define CONFIG_BSYS "run bbl; run bdtb; run bkr; run bfs"
++#define CONFIG_BSYS "run bbl; run bkr; run bfs"
+
+#define CONFIG_CLRAPPS "nand erase d000000 13000000"
+
@@ -131,21 +134,22 @@
#ifdef CONFIG_SYS_USE_MMC
#define CONFIG_BOOTARGS \
"console=ttyS0,115200 earlyprintk " \
-@@ -203,8 +234,8 @@
+@@ -201,10 +228,7 @@
+ #else
+ #define CONFIG_BOOTARGS \
"console=ttyS0,115200 earlyprintk " \
- "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \
- "256K(env),256k(evn_redundent),256k(spare)," \
+- "mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro," \
+- "256K(env),256k(evn_redundent),256k(spare)," \
- "512k(dtb),6M(kernel)ro,-(rootfs) " \
- "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs"
-+ "512k(dtb),6M(kernel)ro,200M(rootfs),-(apps) " \
-+ "rootfstype=ubifs ubi.mtd=7 root=ubi0:rootfs rw"
++ "rootfstype=ubifs ubi.mtd=2 root=ubi0:rootfs rw"
#endif
#define CONFIG_BAUDRATE 115200
diff -Nuar u-boot-at91/include/env_default.h u-boot-at91-sama5d4/include/env_default.h
--- u-boot-at91/include/env_default.h 2019-08-04 21:52:13.000000000 +0800
-+++ u-boot-at91-sama5d4/include/env_default.h 2019-08-22 16:33:49.407073630 +0800
-@@ -76,6 +76,33 @@
++++ u-boot-at91-sama5d4/include/env_default.h 2019-08-22 23:47:56.027573267 +0800
+@@ -76,6 +76,30 @@
#ifdef CONFIG_SERVERIP
"serverip=" __stringify(CONFIG_SERVERIP) "\0"
#endif
@@ -156,9 +160,6 @@
+#endif
+#ifdef CONFIG_BBL
+ "bbl=" CONFIG_BBL "\0"
-+#endif
-+#ifdef CONFIG_BDTB
-+ "bdtb=" CONFIG_BDTB "\0"
+#endif
+#ifdef CONFIG_BKR
+ "bkr=" CONFIG_BKR "\0"
@@ -181,7 +182,7 @@
#endif
diff -Nuar u-boot-at91/Makefile u-boot-at91-sama5d4/Makefile
--- u-boot-at91/Makefile 2019-08-04 21:52:12.000000000 +0800
-+++ u-boot-at91-sama5d4/Makefile 2019-08-22 11:46:09.222742538 +0800
++++ u-boot-at91-sama5d4/Makefile 2019-08-22 19:29:07.323275389 +0800
@@ -194,6 +194,9 @@
#########################################################################
--
Gitblit v1.9.1