mxs: adjust DTS path for 6.6

[openwrt/staging/pepe2k.git] / target / linux / mxs / image / Makefile

diff --git a/target/linux/mxs/image/Makefile b/target/linux/mxs/image/Makefile
index 53a51fc604aa69910674d5f5345529edf0803341..585211dc0bc810a64ceb883645df092c84593182 100644 (file)
--- a/target/linux/mxs/image/Makefile
+++ b/target/linux/mxs/image/Makefile
@@ -1,69 +1,84 @@
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
+# Copyright (C) 2013-2015 OpenWrt.org
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-BOARDS:= \
-       imx23-olinuxino \
-       imx28-duckbill
+FAT32_BLOCK_SIZE=1024
+FAT32_BLOCKS=$(shell echo $$(($(CONFIG_MXS_SD_BOOT_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE))))
 
-define Image/BuildKernel/olinuxino-bootlet
-       cat $(LINUX_DIR)/arch/arm/boot/zImage $(LINUX_DIR)/arch/arm/boot/dts/imx23-olinuxino.dtb > $(STAGING_DIR)/zImage_dtb
-       (cd $(STAGING_DIR); \
-       $(STAGING_DIR)/../host/bin/elftosb -z -c ./linux_prebuilt.db -o linux.sb; \
-       dd if=/dev/zero of=sd_mmc_bootstream.raw bs=512 count=4; \
-       dd if=linux.sb of=$(BIN_DIR)/openwrt-imx23-sbImage ibs=512 seek=4; \
-       )
-endef
+KERNEL_LOADADDR:=0x40008000
 
-define Image/BuildKernel/olinuxino-uboot
-       mkimage -A arm -O linux -T kernel -C none \
-               -a 0x42000000 -e 0x42000000 \
-               -n 'ARM OpenWrt Linux-$(LINUX_VERSION)' \
-               -d $(KDIR)/vmlinux $(KDIR)/uImage
-       cp $(KDIR)/uImage $(BIN_DIR)/$(IMG_PREFIX)-uImage
+define Build/mxs-sdcard-ext4-ext4
+       ./gen_sdcard_ext4_ext4.sh \
+               $@ \
+               $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)/u-boot.sb \
+               $(IMAGE_ROOTFS) \
+               $(CONFIG_TARGET_ROOTFS_PARTSIZE)
 endef
 
-define Image/BuildKernel
+define Build/mxs-sdcard-vfat-ext4
+       rm -f $@.boot
+       mkfs.fat $@.boot -C $(FAT32_BLOCKS)
 
-  ifeq ($(CONFIG_PACKAGE_imx-bootlets),y)
-       $(call Image/BuildKernel/olinuxino-bootlet)
-  endif
+       mcopy -i $@.boot $(DTS_DIR)/$(DEVICE_DTS).dtb ::$(DEVICE_DTS).dtb
+       mcopy -i $@.boot $(IMAGE_KERNEL) ::uImage
 
-  ifeq ($(CONFIG_PACKAGE_uboot-imx23-mx23_olinuxino),y)
-       $(call Image/BuildKernel/olinuxino-uboot)
-  endif
-  
-       $(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(BIN_DIR)/openwrt-$(BOARD)-zImage
-       $(foreach board,$(BOARDS),
-               $(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(BIN_DIR)/
-       )
+       ./gen_sdcard_vfat_ext4.sh \
+               $@ \
+               $(STAGING_DIR_IMAGE)/$(DEVICE_NAME)/u-boot.sb \
+               $@.boot \
+               $(IMAGE_ROOTFS) \
+               $(CONFIG_MXS_SD_BOOT_PARTSIZE) \
+               $(CONFIG_TARGET_ROOTFS_PARTSIZE)
 endef
 
-define Image/InstallKernel
+define Device/Default
+  PROFILES := Default
+  KERNEL_NAME := zImage
+  KERNEL := kernel-bin | uImage none
+  IMAGES := sdcard.img.gz
+ifneq ($(KERNEL),6.1)
+  DTS_DIR := $(DTS_DIR)/nxp/mxs
+endif
+  DEVICE_DTS = $$(SOC)-$(lastword $(subst _, ,$(1)))
+endef
 
-  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_KERNEL),)
-       mkdir -p $(TARGET_DIR)/boot
-       $(CP) $(LINUX_DIR)/arch/arm/boot/zImage $(TARGET_DIR)/boot/
-  endif
-  
-  ifneq ($(CONFIG_TARGET_ROOTFS_INCLUDE_DTB),)
-       mkdir -p $(TARGET_DIR)/boot
-       $(foreach board,$(BOARDS),
-               $(CP) $(LINUX_DIR)/arch/arm/boot/dts/$(board).dtb $(TARGET_DIR)/boot/
-       )
-  endif
+define Device/i2se_duckbill
+  DEVICE_VENDOR := I2SE
+  DEVICE_MODEL := Duckbill
+  DEVICE_PACKAGES := -dnsmasq -firewall -ppp -ip6tables -iptables -6relayd -mtd \
+                    uboot-envtools kmod-leds-gpio -kmod-ipt-nathelper
+  SUPPORTED_DEVICES:=i2se,duckbill
+  SOC:=imx28
+  DEVICE_DTS:=imx28-duckbill
+  IMAGE/sdcard.img.gz = mxs-sdcard-ext4-ext4 | append-metadata | gzip
+endef
+TARGET_DEVICES += i2se_duckbill
 
+define Device/olinuxino_maxi
+  DEVICE_VENDOR := Olimex
+  DEVICE_MODEL := OLinuXino Maxi
+  DEVICE_PACKAGES := kmod-usb-net-smsc95xx kmod-pinctrl-mcp23s08-i2c \
+                    kmod-pinctrl-mcp23s08-spi kmod-leds-gpio kmod-sound-core
+  SUPPORTED_DEVICES:=olimex,imx23-olinuxino
+  SOC:=imx23
+  DEVICE_DTS:=imx23-olinuxino
+  IMAGE/sdcard.img.gz = mxs-sdcard-vfat-ext4 | append-metadata | gzip
 endef
+TARGET_DEVICES += olinuxino_maxi
 
-define Image/Build
-       $(call Image/Build/$(1))
-       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
+define Device/olinuxino_micro
+  DEVICE_VENDOR := Olimex
+  DEVICE_MODEL := OLinuXino Micro
+  DEVICE_PACKAGES := kmod-pinctrl-mcp23s08-spi kmod-pinctrl-mcp23s08-i2c \
+                    kmod-leds-gpio
+  SUPPORTED_DEVICES:=olimex,imx23-olinuxino
+  SOC:=imx23
+  DEVICE_DTS:=imx23-olinuxino
+  IMAGE/sdcard.img.gz = mxs-sdcard-vfat-ext4 | append-metadata | gzip
 endef
+TARGET_DEVICES += olinuxino_micro
 
 $(eval $(call BuildImage))