From cf88d1477ab74555131a3b78bc3d4cb4ec8f5727 Mon Sep 17 00:00:00 2001 From: Wademar Brodkorb Date: Sun, 4 Aug 2024 04:48:55 +0200 Subject: solidrun-clearfog: make it boot with OpenADK mini.config --- package/u-boot/Makefile | 2 +- scripts/install.sh | 2 +- target/arm/Makefile | 5 ++++- target/arm/kernel/solidrun-clearfog | 11 +++++++---- target/linux/config/Config.in.block | 33 +++++++++++++++++++++++++++++++++ target/linux/config/Config.in.ethernet | 10 ++++++++++ 6 files changed, 56 insertions(+), 7 deletions(-) diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index c3976e0ce..fa0f1a687 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -27,7 +27,7 @@ $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP UBOOT:= u-boot.bin ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) CONFIG:= clearfog_defconfig -UBOOT:= u-boot-spl.kwb +UBOOT:= u-boot-with-spl.kwb endif ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_IMX6),y) CONFIG:= pcm058_defconfig diff --git a/scripts/install.sh b/scripts/install.sh index e3494d5d6..335607391 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -563,7 +563,7 @@ case $target { dd if="$fwdir/u-boot-sunxi-with-spl.bin" of="$tgt" bs=1024 seek=8 > /dev/null 2>&1 ;; (solidrun-clearfog) - dd if="$fwdir/u-boot-spl.kwb" of="$tgt" bs=512 seek=1 > /dev/null 2>&1 + dd if="$fwdir/u-boot-with-spl.kwb" of="$tgt" bs=512 seek=1 > /dev/null 2>&1 ;; (solidrun-imx6|phytec-imx6) dd if="$fwdir/SPL" of="$tgt" bs=1024 seek=1 > /dev/null 2>&1 diff --git a/target/arm/Makefile b/target/arm/Makefile index 255d5c793..f6ddf3c76 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -193,6 +193,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y) VENDOR:=xilinx/ endif +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) +VENDOR:=marvell/ +endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) VENDOR:=st/ endif @@ -255,7 +258,7 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) $(VENDOR)imx6dl-hummingboard.dtb $(VENDOR)imx6q-hummingboard.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) - ${KERNEL_MAKE} armada-388-clearfog.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)armada-388-clearfog.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F429),y) ${KERNEL_MAKE} dtbs $(MAKE_TRACE) diff --git a/target/arm/kernel/solidrun-clearfog b/target/arm/kernel/solidrun-clearfog index 431536dff..b75cf2c6d 100644 --- a/target/arm/kernel/solidrun-clearfog +++ b/target/arm/kernel/solidrun-clearfog @@ -1,9 +1,12 @@ CONFIG_ARM=y CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_MVEBU=y -CONFIG_MACH_ARMADA_370=y -CONFIG_MACH_ARMADA_375=y -CONFIG_MACH_ARMADA_380=y -CONFIG_MACH_ARMADA_XP=y +CONFIG_MACH_MVEBU_ANY=y +CONFIG_MACH_MVEBU_V7=y +CONFIG_MACH_ARMADA_38X=y +CONFIG_KUSER_HELPERS=y +CONFIG_ATAGS=y CONFIG_PCI_MVEBU=y diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index a287c05cf..59fffad68 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -154,6 +154,12 @@ config ADK_LINUX_KERNEL_MMC_SDHCI_IPROC config ADK_LINUX_KERNEL_MMC_SDHCI_BRCMSTB bool +config ADK_LINUX_KERNEL_MMC_SDHCI_DOVE + bool + +config ADK_LINUX_KERNEL_MMC_SDHCI_PXAV3 + bool + config ADK_LINUX_KERNEL_MMC_BCM2835_MMC bool @@ -483,6 +489,33 @@ config ADK_LINUX_KERNEL_MMC_BCM2835_MMC default y if ADK_TARGET_BOARD_BCM28XX default n +config ADK_LINUX_KERNEL_MMC_MVSDIO + bool "SD card support for Soidrun Clearfog" + select ADK_LINUX_KERNEL_BLOCK + select ADK_LINUX_KERNEL_LBDAF + select ADK_LINUX_KERNEL_SCSI + select ADK_LINUX_KERNEL_SCSI_DMA + select ADK_LINUX_KERNEL_SCSI_MULTI_LUN + select ADK_LINUX_KERNEL_SCSI_CONSTANTS + select ADK_LINUX_KERNEL_SCSI_LOGGING + select ADK_LINUX_KERNEL_SCSI_SCAN_ASYNC + select ADK_LINUX_KERNEL_MMC + select ADK_LINUX_KERNEL_MMC_BLOCK + select ADK_LINUX_KERNEL_MMC_BLOCK_BOUNCE + select ADK_LINUX_KERNEL_BLK_DEV + select ADK_LINUX_KERNEL_BLK_DEV_SD + select ADK_LINUX_KERNEL_BLK_DEV_BSG + select ADK_LINUX_KERNEL_BLK_DEV_BSGLIB + select ADK_LINUX_KERNEL_MMC_SDHCI + select ADK_LINUX_KERNEL_MMC_SDHCI_IO_ACCESSORS + select ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM + select ADK_LINUX_KERNEL_MMC_SDHCI_DOVE + select ADK_LINUX_KERNEL_MMC_SDHCI_PXAV3 + select ADK_LINUX_KERNEL_MMC_UNSAFE_RESUME + depends on ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default n + config ADK_LINUX_KERNEL_MMC_SDHCI_ESDHC_IMX bool "SD card support for IMX6 boards" select ADK_LINUX_KERNEL_BLOCK diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index ec58b3069..7c3a617ed 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -451,6 +451,16 @@ config ADK_LINUX_KERNEL_MACB also supports the Cadence GEM (Gigabit Ethernet MAC found in some ARM SoC devices). +config ADK_LINUX_KERNEL_MVNETA + tristate "Marvell Ethernet driver for Solidrun Clearfog" + select ADK_LINUX_KERNEL_NETDEV_1000 + select ADK_LINUX_KERNEL_NET_VENDOR_MARVELL + depends on ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default n + help + Marvell Ethernet driver + config ADK_LINUX_KERNEL_TI_DAVINCI_MDIO tristate "BeagleBone Back Davinci" select ADK_LINUX_KERNEL_NET_VENDOR_TI -- cgit v1.2.3