From b5a0e1f270688ad03f0d20199d194c948b097bd2 Mon Sep 17 00:00:00 2001 From: guowenxue <guowenxue@gmail.com> Date: Thu, 22 Aug 2019 18:59:30 +0800 Subject: [PATCH] update at91bootstrap and u-boot-at91 patch, remove eeprom in bootstrap and add default env in u-boot --- linux-bsp/patches/at91bootstrap-sama5d4.patch | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/linux-bsp/patches/at91bootstrap-sama5d4.patch b/linux-bsp/patches/at91bootstrap-sama5d4.patch index 729c735..91e26f8 100644 --- a/linux-bsp/patches/at91bootstrap-sama5d4.patch +++ b/linux-bsp/patches/at91bootstrap-sama5d4.patch @@ -1,7 +1,7 @@ diff -Nuar at91bootstrap/build.sh at91bootstrap-sama5d4/build.sh --- at91bootstrap/build.sh 1970-01-01 08:00:00.000000000 +0800 -+++ at91bootstrap-sama5d4/build.sh 2019-08-04 22:38:17.093670157 +0800 -@@ -0,0 +1,69 @@ ++++ at91bootstrap-sama5d4/build.sh 2019-08-22 18:54:20.707235362 +0800 +@@ -0,0 +1,71 @@ +#!/bin/bash + +BOARD=sama5d4 @@ -18,6 +18,7 @@ + make CROSS_COMPILE=${CROSSTOOL} mrproper + find -iname "*.pyc" | xargs rm -rf {} \; + rm -f $IMG_NAME ++ rm -f cscope* tags +} + +function do_modify() @@ -34,7 +35,8 @@ + +function do_build() +{ -+ if [ ! -f .confg ] ; then ++ if [ ! -f .config ] ; then ++ echo "cp .cfg-${BOARD} .config" + cp .cfg-${BOARD} .config + fi + @@ -73,11 +75,11 @@ + diff -Nuar at91bootstrap/.cfg-sama5d4 at91bootstrap-sama5d4/.cfg-sama5d4 --- at91bootstrap/.cfg-sama5d4 1970-01-01 08:00:00.000000000 +0800 -+++ at91bootstrap-sama5d4/.cfg-sama5d4 2019-08-04 22:39:19.309671350 +0800 ++++ at91bootstrap-sama5d4/.cfg-sama5d4 2019-08-22 13:18:47.498849159 +0800 @@ -0,0 +1,274 @@ +# +# Automatically generated make config: don't edit -+# Sun Aug 4 22:19:10 2019 ++# Thu Aug 22 13:18:42 2019 +# +HAVE_DOT_CONFIG=y +# CONFIG_AT91SAM9260EK is not set @@ -212,9 +214,9 @@ +CONFIG_TWI1=y +CONFIG_TWI2=y +CONFIG_TWI3=y -+CONFIG_MACB=y ++# CONFIG_MACB is not set +# CONFIG_AES is not set -+CONFIG_LOAD_HW_INFO=y ++# CONFIG_LOAD_HW_INFO is not set +CPU_HAS_TWI0=y +CPU_HAS_TWI1=y +CPU_HAS_TWI2=y @@ -321,8 +323,8 @@ +# +# Select the Devices to the Low-power mode +# -+CONFIG_MAC0_PHY=y -+CONFIG_HDMI=y ++# CONFIG_MAC0_PHY is not set ++# CONFIG_HDMI is not set +CONFIG_PM_PMIC=y +# CONFIG_BACKUP_MODE is not set + @@ -337,7 +339,7 @@ +# +# Board Hardware Information Options +# -+CONFIG_LOAD_EEPROM=y ++# CONFIG_LOAD_EEPROM is not set +CONFIG_AUTOCONFIG_TWI_BUS=y + +# @@ -351,7 +353,7 @@ +CONFIG_PMC=y diff -Nuar at91bootstrap/Makefile at91bootstrap-sama5d4/Makefile --- at91bootstrap/Makefile 2019-08-02 17:30:35.000000000 +0800 -+++ at91bootstrap-sama5d4/Makefile 2019-08-04 22:30:49.613661573 +0800 ++++ at91bootstrap-sama5d4/Makefile 2019-08-22 11:46:05.882742473 +0800 @@ -119,6 +119,7 @@ HOSTARCH := $(shell uname -m | sed -e s/arm.*/arm/) -- Gitblit v1.9.1