This enabled support for the ALL6000 in the kernel config.
The ALL6000 uses UBIFS, so UBI needs to be enabled in the kernel config.
Besides that, the marvell-rtc is modularized, as not all boards are equipped
with a RTC battery, thus the user should only include the module on boards which
do have one.

Signed-off-by: Daniel Golle <dgo...@allnet.de>

diff --git a/target/linux/kirkwood/Makefile b/target/linux/kirkwood/Makefile
index 355087b..8b0d3b3 100644
--- a/target/linux/kirkwood/Makefile
+++ b/target/linux/kirkwood/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 ARCH:=arm
 BOARD:=kirkwood
 BOARDNAME:=Marvell Kirkwood
-FEATURES:=targz usb jffs2
+FEATURES:=targz usb jffs2 ubifs
 MAINTAINER:=Imre Kaloz <ka...@openwrt.org>
 
 LINUX_VERSION:=3.3.8
diff --git a/target/linux/kirkwood/config-3.3 b/target/linux/kirkwood/config-3.3
index d5234f4..b63d968 100644
--- a/target/linux/kirkwood/config-3.3
+++ b/target/linux/kirkwood/config-3.3
@@ -38,6 +38,11 @@ CONFIG_CPU_PM=y
 CONFIG_CPU_TLB_FEROCEON=y
 CONFIG_CPU_USE_DOMAINS=y
 CONFIG_CRC16=y
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_XZ=y
 # CONFIG_DEBUG_USER is not set
 CONFIG_DECOMPRESS_LZMA=y
 # CONFIG_DLCI is not set
@@ -96,6 +101,9 @@ CONFIG_KTIME_SCALAR=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEGACY_PTYS=y
 CONFIG_LEGACY_PTY_COUNT=256
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_MACH_ALL6000=y
 # CONFIG_MACH_D2NET_V2 is not set
 # CONFIG_MACH_DB88F6281_BP is not set
 CONFIG_MACH_DOCKSTAR=y
@@ -130,6 +138,11 @@ CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ECC=y
 CONFIG_MTD_NAND_ORION=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_BEB_RESERVE=1
+# CONFIG_MTD_UBI_DEBUG is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
 # CONFIG_MTD_ROOTFS_ROOT_DEV is not set
 # CONFIG_MTD_ROOTFS_SPLIT is not set
 # CONFIG_MTD_SM_COMMON is not set
@@ -154,11 +167,17 @@ CONFIG_PHYS_OFFSET=0x0
 CONFIG_PLAT_ORION=y
 # CONFIG_PREEMPT_RCU is not set
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_MV=y
 CONFIG_SCSI=y
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SPLIT_PTLOCK_CPUS=999999
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
+CONFIG_UBIFS_FS=y
+CONFIG_UBIFS_FS_ADVANCED_COMPR=y
+# CONFIG_UBIFS_FS_DEBUG is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_XZ=y
+CONFIG_UBIFS_FS_ZLIB=y
 CONFIG_UID16=y
 CONFIG_USB=y
 CONFIG_USB_ARCH_HAS_XHCI=y
diff --git a/package/kernel/modules/other.mk b/package/kernel/modules/other.mk
index 1bf1755..5e31c47 100644
--- a/package/kernel/modules/other.mk
+++ b/package/kernel/modules/other.mk
@@ -731,6 +731,27 @@ endef
 
 $(eval $(call KernelPackage,pwm-gpio))
 
+define KernelPackage/rtc-marvell
+  SUBMENU:=$(OTHER_MENU)
+  TITLE:=Marvell SoC built-in RTC support
+  $(call AddDepends/rtc)
+  DEPENDS+=@TARGET_kirkwood||TARGET_orion
+  KCONFIG:=CONFIG_RTC_DRV_MV
+  FILES:=$(LINUX_DIR)/drivers/rtc/rtc-mv.ko
+  AUTOLOAD:=$(call AutoLoad,60,rtc-mv)
+endef
+
+define KernelPackage/rtc-marvell/description
+ Kernel module for Marvell SoC built-in RTC.
+ Only include this module if you are sure that your board is equipped with a
+ battery to keep the RTC alive. Otherwise your clock will be scrambled after
+ every boot!
+endef
+
+$(eval $(call KernelPackage,rtc-marvell))
+
+
+
 define KernelPackage/rtc-pcf8563
   SUBMENU:=$(OTHER_MENU)
   TITLE:=Philips PCF8563/Epson RTC8564 RTC support

Attachment: pgpPEsW0C2MuU.pgp
Description: PGP signature

_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel

Reply via email to