aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/boot/uboot-layerscape-armv8_32b/Makefile10
-rw-r--r--package/boot/uboot-layerscape/Makefile10
-rw-r--r--package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt8
-rw-r--r--package/boot/uboot-layerscape/files/ls1012afrwy-uEnv.txt8
-rw-r--r--package/firmware/layerscape/ls-ppa/Makefile6
-rw-r--r--package/firmware/layerscape/ls-rcw/Makefile8
-rw-r--r--target/linux/layerscape/image/armv8_32b.mk38
-rw-r--r--target/linux/layerscape/image/armv8_64b.mk36
8 files changed, 64 insertions, 60 deletions
diff --git a/package/boot/uboot-layerscape-armv8_32b/Makefile b/package/boot/uboot-layerscape-armv8_32b/Makefile
index b9cec52174..c2b6e75b0e 100644
--- a/package/boot/uboot-layerscape-armv8_32b/Makefile
+++ b/package/boot/uboot-layerscape-armv8_32b/Makefile
@@ -39,10 +39,10 @@ define Package/uboot-layerscape-armv8_32b/ls1012ardb
ENV_SIZE:=0x40000
endef
-define Package/uboot-layerscape-armv8_32b/ls1012afrdm
- TITLE:=U-Boot image for NXP LS1012FRDM
- CONFIG:=ls1012afrdm-uboot.bin
- ENV_SIZE:=0x40000
+define Package/uboot-layerscape-armv8_32b/ls1012afrwy
+ TITLE:=U-Boot image for NXP LS1012FRWY
+ CONFIG:=ls1012afrwy-uboot.bin
+ ENV_SIZE:=0x10000
endef
define Package/uboot-layerscape-armv8_32b/ls1043ardb
@@ -72,7 +72,7 @@ endef
UBOOTS := \
ls1012ardb \
- ls1012afrdm \
+ ls1012afrwy \
ls1043ardb \
ls1046ardb
diff --git a/package/boot/uboot-layerscape/Makefile b/package/boot/uboot-layerscape/Makefile
index ef456bfc7e..39dc6c76d1 100644
--- a/package/boot/uboot-layerscape/Makefile
+++ b/package/boot/uboot-layerscape/Makefile
@@ -33,10 +33,10 @@ define U-Boot/ls1012ardb
ENV_SIZE:=0x40000
endef
-define U-Boot/ls1012afrdm
- NAME:=NXP LS1012AFRDM
- UBOOT_CONFIG:=ls1012afrdm_qspi
- ENV_SIZE:=0x40000
+define U-Boot/ls1012afrwy
+ NAME:=NXP LS1012AFRWY
+ UBOOT_CONFIG:=ls1012afrwy_qspi
+ ENV_SIZE:=0x10000
endef
define U-Boot/ls1043ardb
@@ -94,7 +94,7 @@ endef
UBOOT_TARGETS := \
ls1012ardb \
- ls1012afrdm \
+ ls1012afrwy \
ls1043ardb \
ls1043ardb-sdboot \
ls1046ardb \
diff --git a/package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt b/package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt
deleted file mode 100644
index 32419dd33d..0000000000
--- a/package/boot/uboot-layerscape/files/ls1012afrdm-uEnv.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-fdtaddr=0x8f000000
-loadaddr=0x81000000
-fdt_high=0xffffffffffffffff
-initrd_high=0xffffffffffffffff
-qspi_boot=sf probe 0:0;sf read $fdtaddr f00000 100000;sf read $loadaddr 1000000 1000000;bootm $loadaddr - $fdtaddr
-bootargs=ubi.mtd=9 root=ubi0:rootfs rw rootfstype=ubifs noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200 mtdparts=1550000.quadspi:1m(rcw),2m(u-boot),1m(u-boot-env),2m(ppa),4m(reserved-1),3m(pfe),2m(reserved-2),1m(dtb),16m(kernel),32m(ubifs)
-bootcmd=echo starting openwrt ...;pfe stop;run qspi_boot
-bootdelay=3
diff --git a/package/boot/uboot-layerscape/files/ls1012afrwy-uEnv.txt b/package/boot/uboot-layerscape/files/ls1012afrwy-uEnv.txt
new file mode 100644
index 0000000000..31178df690
--- /dev/null
+++ b/package/boot/uboot-layerscape/files/ls1012afrwy-uEnv.txt
@@ -0,0 +1,8 @@
+fdtaddr=0x8f000000
+loadaddr=0x81000000
+fdt_high=0xffffffffffffffff
+initrd_high=0xffffffffffffffff
+sd_boot=mmc read $fdtaddr 7800 800;mmc read $loadaddr 8000 8000;bootm $loadaddr - $fdtaddr
+bootargs=root=/dev/mmcblk0p1 rw rootwait rootfstype=ext4 noinitrd earlycon=uart8250,mmio,0x21c0500 console=ttyS0,115200
+bootcmd=echo starting openwrt ...;pfe stop;run sd_boot
+bootdelay=3
diff --git a/package/firmware/layerscape/ls-ppa/Makefile b/package/firmware/layerscape/ls-ppa/Makefile
index 7a6a9b0b84..159f5ef6d4 100644
--- a/package/firmware/layerscape/ls-ppa/Makefile
+++ b/package/firmware/layerscape/ls-ppa/Makefile
@@ -33,8 +33,8 @@ define Package/layerscape-ppa/ls1012ardb
CONFIG:=ppa-ls1012a.itb
endef
-define Package/layerscape-ppa/ls1012afrdm
- TITLE:=NXP LS1012AFRDM PPA binary
+define Package/layerscape-ppa/ls1012afrwy
+ TITLE:=NXP LS1012AFRWY PPA binary
CONFIG:=ppa-ls1012a.itb
endef
@@ -70,7 +70,7 @@ endef
PPAS := \
ls1012ardb \
- ls1012afrdm \
+ ls1012afrwy \
ls1043ardb \
ls1046ardb \
ls1088ardb \
diff --git a/package/firmware/layerscape/ls-rcw/Makefile b/package/firmware/layerscape/ls-rcw/Makefile
index 13d015d251..9de68b1cc9 100644
--- a/package/firmware/layerscape/ls-rcw/Makefile
+++ b/package/firmware/layerscape/ls-rcw/Makefile
@@ -33,9 +33,9 @@ define Package/layerscape-rcw/ls1012ardb
CONFIG:=ls1012ardb/R_SPNH_3508/rcw_1000_default.bin.swapped
endef
-define Package/layerscape-rcw/ls1012afrdm
- TITLE:=NXP LS1012AFRDM RCW binary
- CONFIG:=ls1012afrdm/N_SSNP_3305/rcw_800.bin.swapped
+define Package/layerscape-rcw/ls1012afrwy
+ TITLE:=NXP LS1012AFRWY RCW binary
+ CONFIG:=ls1012afrwy/N_SSNP_3305/rcw_1000_default.bin.swapped
endef
define Package/layerscape-rcw/ls1043ardb
@@ -77,7 +77,7 @@ endef
RCWS := \
ls1012ardb \
- ls1012afrdm \
+ ls1012afrwy \
ls1043ardb \
ls1046ardb \
ls1088ardb \
diff --git a/target/linux/layerscape/image/armv8_32b.mk b/target/linux/layerscape/image/armv8_32b.mk
index b3beefba39..95418926fd 100644
--- a/target/linux/layerscape/image/armv8_32b.mk
+++ b/target/linux/layerscape/image/armv8_32b.mk
@@ -41,31 +41,33 @@ define Device/ls1012ardb
endef
TARGET_DEVICES += ls1012ardb
-define Device/ls1012afrdm
- DEVICE_TITLE := LS1012AFRDM
+define Device/ls1012afrwy
+ DEVICE_TITLE := LS1012AFRWY
DEVICE_PACKAGES += \
- layerscape-rcw-ls1012afrdm \
+ layerscape-rcw-ls1012afrwy \
layerscape-ppfe \
- layerscape-ppa-ls1012afrdm \
- u-boot-ls1012afrdm-image \
+ layerscape-ppa-ls1012afrwy \
+ u-boot-ls1012afrwy-image \
kmod-ppfe
- DEVICE_DTS := ../../../arm64/boot/dts/freescale/fsl-ls1012a-frdm
- UBIFS_OPTS := -m 1 -e 262016 -c 128
- UBINIZE_OPTS := -E 5
- BLOCKSIZE := 256KiB
- PAGESIZE := 1
+ DEVICE_DTS := ../../../arm64/boot/dts/freescale/fsl-ls1012a-frwy
+ FILESYSTEMS := ext4
+ IMAGES := firmware.bin sdcard.img
IMAGE/firmware.bin := \
ls-clean | \
- ls-append $(1)-rcw.bin | pad-to 1M | \
- ls-append $(1)-uboot.bin | pad-to 3M | \
- ls-append $(1)-uboot-env.bin | pad-to 4M | \
- ls-append $(1)-ppa.itb | pad-to 10M | \
- ls-append pfe.itb | pad-to 15M | \
+ ls-append $(1)-rcw.bin | pad-to 128K | \
+ ls-append pfe.itb | pad-to 384K | \
+ ls-append $(1)-ppa.itb | pad-to 1024K | \
+ ls-append $(1)-uboot.bin | pad-to 1856K | \
+ ls-append $(1)-uboot-env.bin | pad-to 2048K | \
+ check-size 2097153
+ IMAGE/sdcard.img := \
+ ls-clean | \
+ ls-append-sdhead $(1) | pad-to 15M | \
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
- append-kernel | pad-to 32M | \
- append-ubi | check-size 67108865
+ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \
+ append-rootfs | check-size $(LS_SD_IMAGE_SIZE)
endef
-TARGET_DEVICES += ls1012afrdm
+TARGET_DEVICES += ls1012afrwy
define Device/ls1043ardb
DEVICE_TITLE := LS1043ARDB
diff --git a/target/linux/layerscape/image/armv8_64b.mk b/target/linux/layerscape/image/armv8_64b.mk
index a144fd0c66..79e05efc1c 100644
--- a/target/linux/layerscape/image/armv8_64b.mk
+++ b/target/linux/layerscape/image/armv8_64b.mk
@@ -39,30 +39,32 @@ define Device/ls1012ardb
endef
TARGET_DEVICES += ls1012ardb
-define Device/ls1012afrdm
- DEVICE_TITLE := LS1012AFRDM
+define Device/ls1012afrwy
+ DEVICE_TITLE := LS1012AFRWY
DEVICE_PACKAGES += \
- layerscape-rcw-ls1012afrdm \
+ layerscape-rcw-ls1012afrwy \
layerscape-ppfe \
- layerscape-ppa-ls1012afrdm \
+ layerscape-ppa-ls1012afrwy \
kmod-ppfe
- DEVICE_DTS := freescale/fsl-ls1012a-frdm
- UBIFS_OPTS := -m 1 -e 262016 -c 128
- UBINIZE_OPTS := -E 5
- BLOCKSIZE := 256KiB
- PAGESIZE := 1
+ DEVICE_DTS := freescale/fsl-ls1012a-frwy
+ FILESYSTEMS := ext4
+ IMAGES := firmware.bin sdcard.img
IMAGE/firmware.bin := \
ls-clean | \
- ls-append $(1)-rcw.bin | pad-to 1M | \
- ls-append $(1)-uboot.bin | pad-to 3M | \
- ls-append $(1)-uboot-env.bin | pad-to 4M | \
- ls-append $(1)-ppa.itb | pad-to 10M | \
- ls-append pfe.itb | pad-to 15M | \
+ ls-append $(1)-rcw.bin | pad-to 128K | \
+ ls-append pfe.itb | pad-to 384K | \
+ ls-append $(1)-ppa.itb | pad-to 1024K | \
+ ls-append $(1)-uboot.bin | pad-to 1856K | \
+ ls-append $(1)-uboot-env.bin | pad-to 2048K | \
+ check-size 2097153
+ IMAGE/sdcard.img := \
+ ls-clean | \
+ ls-append-sdhead $(1) | pad-to 15M | \
ls-append-dtb $$(DEVICE_DTS) | pad-to 16M | \
- append-kernel | pad-to 32M | \
- append-ubi | check-size 67108865
+ append-kernel | pad-to $(LS_SD_ROOTFSPART_OFFSET)M | \
+ append-rootfs | check-size $(LS_SD_IMAGE_SIZE)
endef
-TARGET_DEVICES += ls1012afrdm
+TARGET_DEVICES += ls1012afrwy
define Device/ls1043ardb
DEVICE_TITLE := LS1043ARDB
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 07:15:59 +0000