domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

at91: separate MKUBIFS opts to defaults in the sub target

Browse Source 
Instead of applying global defaults based on selected board, transition
to using a per board setting for UBIFS and UBINIZE.

Signed-off-by: Ben Whitten <ben.whitten@gmail.com>
This commit is contained in:
Ben Whitten
2017-06-01 23:04:52 +01:00
committed by Hauke Mehrtens
parent 3b6f9978d3
commit a7c8112a0f
3 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
target/linux/at91/image/Makefile
View File

@@ -11,29 +11,19 @@ KERNEL_LOADADDR := 0x20008000
ifeq ($(SUBTARGET),legacy) ifeq ($(SUBTARGET),legacy)
include ./legacy.mk include ./legacy.mk
UBIFS_OPTS := -m 2048 -e 126KiB -c 2048
endif endif
ifeq ($(SUBTARGET),sama5) ifeq ($(SUBTARGET),sama5)
include ./sama5.mk include ./sama5.mk
ifeq ($(TARGET_DEVICES),at91-sama5d4_xplained)
UBIFS_OPTS := -e 0x3e000 -c 2082 -m 0x1000 -x lzo
UBINIZE_OPTS := -m 0x1000 -p 0x40000
else
UBIFS_OPTS := -m 2048 -e 124KiB -c 2048
endif
endif endif
define Device/Default define Device/Default
$(Device/default-nand)
PROFILES := Default PROFILES := Default
FILESYSTEMS := squashfs ubifs FILESYSTEMS := squashfs ubifs
DEVICE_DTS := $(1) DEVICE_DTS := $(1)
KERNEL_NAME := zImage KERNEL_NAME := zImage
KERNEL_SIZE := 4096k KERNEL_SIZE := 4096k
KERNEL := kernel-bin | append-dtb | lzma | uImage lzma KERNEL := kernel-bin | append-dtb | lzma | uImage lzma
BLOCKSIZE := 128k
PAGESIZE := 2048
SUBPAGESIZE := 512
DTB_SIZE := DTB_SIZE :=
endef endef

7
target/linux/at91/image/legacy.mk
View File

@@ -1,3 +1,10 @@
define Device/default-nand
BLOCKSIZE := 128k
PAGESIZE := 2048
SUBPAGESIZE := 512
MKUBIFS_OPTS := -m $$(PAGESIZE) -e 126KiB -c 2048
endef
define Device/at91sam9263ek define Device/at91sam9263ek
$(Device/evaluation-dtb) $(Device/evaluation-dtb)
DEVICE_TITLE := Atmel AT91SAM9263-EK DEVICE_TITLE := Atmel AT91SAM9263-EK

12
target/linux/at91/image/sama5.mk
View File

@@ -1,8 +1,14 @@
define Device/default-nand
BLOCKSIZE := 128k
PAGESIZE := 2048
SUBPAGESIZE := 2048
MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB -c 2048
endef
define Device/at91-sama5d3_xplained define Device/at91-sama5d3_xplained
$(Device/evaluation-dtb) $(Device/evaluation-dtb)
DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D3 Xplained DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D3 Xplained
KERNEL_SIZE := 6144k KERNEL_SIZE := 6144k
SUBPAGESIZE := 2048
endef endef
TARGET_DEVICES += at91-sama5d3_xplained TARGET_DEVICES += at91-sama5d3_xplained
@@ -10,7 +16,6 @@ define Device/at91-sama5d2_xplained
$(Device/evaluation-dtb) $(Device/evaluation-dtb)
DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D2 Xplained DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D2 Xplained
KERNEL_SIZE := 6144k KERNEL_SIZE := 6144k
SUBPAGESIZE := 2048
endef endef
TARGET_DEVICES += at91-sama5d2_xplained TARGET_DEVICES += at91-sama5d2_xplained
@@ -18,6 +23,9 @@ define Device/at91-sama5d4_xplained
$(Device/evaluation-dtb) $(Device/evaluation-dtb)
DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D4 Xplained DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D4 Xplained
KERNEL_SIZE := 6144k KERNEL_SIZE := 6144k
BLOCKSIZE := 256k
PAGESIZE := 4096
SUBPAGESIZE := 2048 SUBPAGESIZE := 2048
MKUBIFS_OPTS := -m $$(PAGESIZE) -e 248KiB -c 2082 -x lzo
endef endef
TARGET_DEVICES += at91-sama5d4_xplained TARGET_DEVICES += at91-sama5d4_xplained