Message ID | aa8d5a51f98facd969e2102a0aebf292093844b6.1539384007.git.sandeepsheriker.mallikarjun@microchip.com |
---|---|
State | Changes Requested |
Delegated to: | John Crispin |
Headers | show |
Series | [OpenWrt-Devel,openwrt-devel,1/8] at91:renaming subtraget legacy to sam9x | expand |
On 10/13/2018 12:41 AM, Sandeep Sheriker Mallikarjun wrote: > Add uboot environment's to sdcard image. > > Signed-off-by: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun@microchip.com> > --- > target/linux/at91/image/Makefile | 16 ++++++++++++++-- > target/linux/at91/image/uboot-env.txt | 14 ++++++++++++++ > 2 files changed, 28 insertions(+), 2 deletions(-) > create mode 100644 target/linux/at91/image/uboot-env.txt > > diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile > index 6c22c38..7bf9be5 100644 > --- a/target/linux/at91/image/Makefile > +++ b/target/linux/at91/image/Makefile > @@ -62,7 +62,11 @@ define Build/at91-sdcard > > mcopy -i $@.boot \ > $(KDIR)/$(DEVICE_NAME)-fit-zImage.itb \ > - ::$(DEVICE_NAME:at91-%=%)-fit.itb , > + ::$(DEVICE_NAME:at91-%=%)-fit.itb > + > + sed -i '2d;3d' ./uboot-env.txt > + sed -i '2i board='"$(DEVICE_NAME:at91-%=%)"'' ./uboot-env.txt > + sed -i '3i board_name='"$(DEVICE_NAME:at91-%=%)"'' ./uboot-env.txt , Please do these modifications on a working copy and not on the original file. After building this I get a modification on a file under control of git. > > mcopy -i $@.boot $(BIN_DIR)/u-boot-*_mmc/u-boot.bin ::u-boot.bin > > @@ -70,7 +74,15 @@ define Build/at91-sdcard > $(BIN_DIR)/at91bootstrap-*sd*/at91bootstrap.bin ::BOOT.bin > > mcopy -i $@.boot \ > - $(KDIR)/$(DEVICE_NAME)-fit-zImage.itb ::$(DEVICE_NAME)-fit.itb) > + $(KDIR)/$(DEVICE_NAME)-fit-zImage.itb ::$(DEVICE_NAME)-fit.itb > + > + sed -i '2d;3d' ./uboot-env.txt > + sed -i '2i board='"$(DEVICE_NAME)"'' ./uboot-env.txt > + sed -i '3i board_name='"$(DEVICE_NAME)"'' ./uboot-env.txt) Same here > + > + mkenvimage -s 0x4000 -o $(BIN_DIR)/uboot.env ./uboot-env.txt > + > + mcopy -i $@.boot $(BIN_DIR)/uboot.env ::uboot.env > > ./gen_at91_sdcard_img.sh \ > $@.img \ > diff --git a/target/linux/at91/image/uboot-env.txt b/target/linux/at91/image/uboot-env.txt > new file mode 100644 > index 0000000..6eb859c > --- /dev/null > +++ b/target/linux/at91/image/uboot-env.txt > @@ -0,0 +1,14 @@ > +/* Do Not remove First 2 lines, Makefile will modify these lines with proper board names */ > +board=at91sam9x25ek > +board_name=at91sam9x25ek > +bootargs=console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait rootfstype=ext4 > +bootargsd2=console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait rootfstype=ext4 > +bootargsxx=console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait rootfstype=ext4 > +bootcmd=run setbootargs; run fatload_mmc; bootm 0x21000000 > +bootdelay=1 > +fatload_mmc=if test ${board_name} = sama5d2_xplained; then fatload mmc 1:1 0x21000000 ${board_name}-fit.itb; else fatload mmc 0:1 0x21000000 ${board_name}-fit.itb; fi > +setbootargs=if test ${board_name} = sama5d2_xplained; then setenv bootargs ${bootargsd2}; else setenv bootargs ${bootargsxx}; fi > +ethact=gmac0 > +stderr=serial > +stdin=serial > +stdout=serial >
diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index 6c22c38..7bf9be5 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -62,7 +62,11 @@ define Build/at91-sdcard mcopy -i $@.boot \ $(KDIR)/$(DEVICE_NAME)-fit-zImage.itb \ - ::$(DEVICE_NAME:at91-%=%)-fit.itb , + ::$(DEVICE_NAME:at91-%=%)-fit.itb + + sed -i '2d;3d' ./uboot-env.txt + sed -i '2i board='"$(DEVICE_NAME:at91-%=%)"'' ./uboot-env.txt + sed -i '3i board_name='"$(DEVICE_NAME:at91-%=%)"'' ./uboot-env.txt , mcopy -i $@.boot $(BIN_DIR)/u-boot-*_mmc/u-boot.bin ::u-boot.bin @@ -70,7 +74,15 @@ define Build/at91-sdcard $(BIN_DIR)/at91bootstrap-*sd*/at91bootstrap.bin ::BOOT.bin mcopy -i $@.boot \ - $(KDIR)/$(DEVICE_NAME)-fit-zImage.itb ::$(DEVICE_NAME)-fit.itb) + $(KDIR)/$(DEVICE_NAME)-fit-zImage.itb ::$(DEVICE_NAME)-fit.itb + + sed -i '2d;3d' ./uboot-env.txt + sed -i '2i board='"$(DEVICE_NAME)"'' ./uboot-env.txt + sed -i '3i board_name='"$(DEVICE_NAME)"'' ./uboot-env.txt) + + mkenvimage -s 0x4000 -o $(BIN_DIR)/uboot.env ./uboot-env.txt + + mcopy -i $@.boot $(BIN_DIR)/uboot.env ::uboot.env ./gen_at91_sdcard_img.sh \ $@.img \ diff --git a/target/linux/at91/image/uboot-env.txt b/target/linux/at91/image/uboot-env.txt new file mode 100644 index 0000000..6eb859c --- /dev/null +++ b/target/linux/at91/image/uboot-env.txt @@ -0,0 +1,14 @@ +/* Do Not remove First 2 lines, Makefile will modify these lines with proper board names */ +board=at91sam9x25ek +board_name=at91sam9x25ek +bootargs=console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait rootfstype=ext4 +bootargsd2=console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait rootfstype=ext4 +bootargsxx=console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait rootfstype=ext4 +bootcmd=run setbootargs; run fatload_mmc; bootm 0x21000000 +bootdelay=1 +fatload_mmc=if test ${board_name} = sama5d2_xplained; then fatload mmc 1:1 0x21000000 ${board_name}-fit.itb; else fatload mmc 0:1 0x21000000 ${board_name}-fit.itb; fi +setbootargs=if test ${board_name} = sama5d2_xplained; then setenv bootargs ${bootargsd2}; else setenv bootargs ${bootargsxx}; fi +ethact=gmac0 +stderr=serial +stdin=serial +stdout=serial
Add uboot environment's to sdcard image. Signed-off-by: Sandeep Sheriker Mallikarjun <sandeepsheriker.mallikarjun@microchip.com> --- target/linux/at91/image/Makefile | 16 ++++++++++++++-- target/linux/at91/image/uboot-env.txt | 14 ++++++++++++++ 2 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 target/linux/at91/image/uboot-env.txt