summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--target/arm/kernel/kinetis-k705
-rw-r--r--target/arm/systems/kinetis-k703
-rw-r--r--target/config/Config.in.gcc1
-rw-r--r--target/linux/config/Config.in.ethernet21
-rw-r--r--target/linux/config/Config.in.flash23
-rw-r--r--target/linux/config/Config.in.kernel4
-rw-r--r--target/linux/config/Config.in.usb24
7 files changed, 65 insertions, 16 deletions
diff --git a/target/arm/kernel/kinetis-k70 b/target/arm/kernel/kinetis-k70
index a2e670272..5093d7a65 100644
--- a/target/arm/kernel/kinetis-k70
+++ b/target/arm/kernel/kinetis-k70
@@ -2,7 +2,6 @@ CONFIG_ARM=y
CONFIG_ARCH_KINETIS=y
CONFIG_MACH_KINETIS=y
CONFIG_KINETIS_UART2=y
-CONFIG_KINETIS_MAC=y
CONFIG_KINETIS_EDMA=y
CONFIG_CPU_32v6K=y
CONFIG_CPU_V7M=y
@@ -10,11 +9,13 @@ CONFIG_CPU_32v7M=y
CONFIG_CPU_ABRT_NOMMU=y
CONFIG_CPU_PABRT_LEGACY=y
CONFIG_CPU_CACHE_VIPT=y
-CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11=y
CONFIG_VFPM=y
+CONFIG_NOMMU_INITIAL_TRIM_EXCESS=0
CONFIG_ARM_L1_CACHE_SHIFT=5
CONFIG_ARM_NVIC=y
CONFIG_ARM_CORTEXM3=y
CONFIG_ARM_ASM_UNIFIED=y
+CONFIG_GPIOLIB=y
+CONFIG_SLAB=y
CONFIG_SERIAL_KINETIS=y
CONFIG_SERIAL_KINETIS_CONSOLE=y
diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70
index 50ca3edde..a54fc3afd 100644
--- a/target/arm/systems/kinetis-k70
+++ b/target/arm/systems/kinetis-k70
@@ -8,10 +8,11 @@ config ADK_TARGET_SYSTEM_KINETIS_K70
select ADK_TARGET_WITH_NETDEVICE
select ADK_TARGET_WITH_NET
select ADK_TARGET_WITH_BLOCK
+ select ADK_TARGET_WITH_NAND
select ADK_TARGET_UCLINUX
select ADK_TARGET_KERNEL_UIMAGE
select ADK_TARGET_KERNEL_REPO "https://github.com/EmcraftSystems/linux-emcraft.git"
- select ADK_TARGET_KERNEL_HASH "f0cbd4e039e07f586f1cf14f3150f9938b74617e"
+ select ADK_TARGET_KERNEL_HASH "1d008423ab5fd12459f53342e4d17585ec63cfe4"
help
Kinetis K70
diff --git a/target/config/Config.in.gcc b/target/config/Config.in.gcc
index 75e31bf47..4a85698a4 100644
--- a/target/config/Config.in.gcc
+++ b/target/config/Config.in.gcc
@@ -7,6 +7,7 @@ default ADK_TOOLCHAIN_GCC_4_2_4 if ADK_TARGET_ARCH_METAG
default ADK_TOOLCHAIN_GCC_4_4_7 if ADK_TARGET_ARCH_AVR32
default ADK_TOOLCHAIN_GCC_4_8_5 if ADK_TARGET_ARCH_C6X
default ADK_TOOLCHAIN_GCC_4_9_3 if ADK_TARGET_LIB_GLIBC && ADK_TARGET_ARCH_SH
+default ADK_TOOLCHAIN_GCC_4_9_3 if ADK_TARGET_SYSTEM_KINETIS_K70
default ADK_TOOLCHAIN_GCC_4_8_ARC if ADK_TARGET_ARCH_ARC
default ADK_TOOLCHAIN_GCC_5_2_OR1K if ADK_TARGET_ARCH_OR1K
default ADK_TOOLCHAIN_GCC_GIT if ADK_TARGET_WITHOUT_MMU && ADK_TARGET_ARCH_XTENSA
diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet
index b0aae0f12..0d08c641f 100644
--- a/target/linux/config/Config.in.ethernet
+++ b/target/linux/config/Config.in.ethernet
@@ -70,6 +70,9 @@ config ADK_KERNEL_ETRAX_HAVE_PHY
config ADK_KERNEL_NET_PCI
bool
+config ADK_KERNEL_NET_ETHERNET
+ bool
+
config ADK_KERNEL_NETDEV_1000
bool
@@ -86,6 +89,9 @@ config ADK_KERNEL_AT803X_PHY
tristate
select ADK_KERNEL_PHYLIB
+config ADK_KERNEL_MICREL_PHY
+ bool
+
config ADK_KERNEL_SWCONFIG
bool
@@ -110,6 +116,20 @@ config ADK_KERNEL_AG71XX
help
Atheros AG71XX ethernet driver
+config ADK_KERNEL_KINETIS_MAC
+ bool "Kinetis ethernet driver"
+ select ADK_KERNEL_NET_ETHERNET
+ select ADK_KERNEL_NET_VENDOR_FREESCALE
+ select ADK_KERNEL_FEC
+ select ADK_KERNEL_PHYLIB
+ select ADK_KERNEL_MICREL_PHY
+ select ADK_KERNEL_MII
+ depends on ADK_TARGET_SYSTEM_KINETIS_K70
+ default y if ADK_TARGET_SYSTEM_KINETIS_K70
+ default n
+ help
+ Ethernet driver for Kinetis K70
+
config ADK_KERNEL_FEC
tristate "FEC ethernet driver"
select ADK_KERNEL_NET_VENDOR_FREESCALE
@@ -119,7 +139,6 @@ config ADK_KERNEL_FEC
ADK_TARGET_SYSTEM_KINETIS_K70
default y if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
default y if ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208
- default y if ADK_TARGET_SYSTEM_KINETIS_K70
default n
help
FEC ethernet driver
diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash
index ca0041688..89ed7e63f 100644
--- a/target/linux/config/Config.in.flash
+++ b/target/linux/config/Config.in.flash
@@ -5,8 +5,8 @@ menu "Flash device support"
depends on ADK_TARGET_WITH_NAND || ADK_TARGET_WITH_MTD || ADK_TARGET_QEMU
config ADK_KERNEL_MTD
- select ADK_KERNEL_GENERIC_IO
bool
+ select ADK_KERNEL_GENERIC_IO
config ADK_KERNEL_GENERIC_IO
bool
@@ -20,6 +20,12 @@ config ADK_KERNEL_MTD_NAND
config ADK_KERNEL_MTD_NAND_PLATFORM
bool
+config ADK_KERNEL_MTD_CMDLINE_PARTS
+ bool
+
+config ADK_KERNEL_MTD_CONCAT
+ bool
+
config ADK_KERNEL_MTD_CHAR
bool
@@ -108,6 +114,21 @@ config ADK_KERNEL_MTD_NAND_PLATFORM
help
platform nand driver
+config ADK_KERNEL_MTD_NAND_FSL_NFC
+ bool "NAND driver for Kinetis K70"
+ select ADK_KERNEL_MISC_FILESYSTEMS
+ select ADK_KERNEL_MTD
+ select ADK_KERNEL_MTD_PARTITIONS
+ select ADK_KERNEL_MTD_NAND
+ select ADK_KERNEL_MTD_CHAR
+ select ADK_KERNEL_MTD_CONCAT
+ select ADK_KERNEL_MTD_BLKDEVS
+ select ADK_KERNEL_MTD_BLOCK
+ select ADK_KERNEL_MTD_CMDLINE_PARTS
+ depends on ADK_TARGET_SYSTEM_KINETIS_K70
+ default y if ADK_TARGET_SYSTEM_KINETIS_K70
+ default n
+
config ADK_TARGET_MTD_SIZE
int
depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \
diff --git a/target/linux/config/Config.in.kernel b/target/linux/config/Config.in.kernel
index 607b3c3a9..ccfb22c0a 100644
--- a/target/linux/config/Config.in.kernel
+++ b/target/linux/config/Config.in.kernel
@@ -79,6 +79,9 @@ config ADK_KERNEL_RD_XZ
config ADK_KERNEL_KERNEL_XZ
bool
+config ADK_KERNEL_KERNEL_COMPRESS_NONE
+ bool
+
config ADK_KERNEL_INITRAMFS_SOURCE
string
default ""
@@ -173,6 +176,7 @@ config ADK_KERNEL_COMP_GZIP
config ADK_KERNEL_COMPRESS_NONE
bool "use no compression"
+ select ADK_KERNEL_KERNEL_COMPRESS_NONE
select ADK_KERNEL_INITRAMFS_COMPRESSION_NONE
endchoice
diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb
index c9cf3126c..ce561155f 100644
--- a/target/linux/config/Config.in.usb
+++ b/target/linux/config/Config.in.usb
@@ -7,12 +7,21 @@ depends on ADK_TARGET_WITH_USB || ADK_TARGET_SYSTEM_QEMU_X86_64 || ADK_TARGET_SY
config ADK_KERNEL_USB_SUPPORT
bool
+config ADK_KERNEL_USB_DEVICE_CLASS
+ bool
+
+config ADK_KERNEL_USB_ANNOUNCE_NEW_DEVICES
+ bool
+
config ADK_KERNEL_USB_EHCI_ROOT_HUB_TT
bool
config ADK_KERNEL_USB_EHCI_TT_NEWSCHED
bool
+config ADK_KERNEL_USB_EHCI_MXC
+ bool
+
config ADK_KERNEL_USB_GADGET
tristate
@@ -85,8 +94,10 @@ menu "USB controller support"
config ADK_KERNEL_USB_EHCI_HCD
tristate "Support for USB EHCI 2.0 controllers"
select ADK_KERNEL_USB_EHCI_ROOT_HUB_TT
- select ADK_KERNEL_USB_EHCI_TT_NEWSCHED
select ADK_KERNEL_USB_MXS_PHY if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+ select ADK_KERNEL_USB_EHCI_MXC if ADK_TARGET_SYSTEM_KINETIS_K70
+ select ADK_KERNEL_USB_DEVICE_CLASS if ADK_TARGET_SYSTEM_KINETIS_K70
+ select ADK_KERNEL_USB_ANNOUNCE_NEW_DEVICES if ADK_TARGET_SYSTEM_KINETIS_K70
depends on !ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20
depends on !ADK_TARGET_BOARD_BCM28XX
depends on ADK_KERNEL_USB
@@ -95,6 +106,7 @@ config ADK_KERNEL_USB_EHCI_HCD
default m if ADK_TARGET_SYSTEM_IBM_X40
default m if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
default m if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
+ default y if ADK_TARGET_SYSTEM_KINETIS_K70
default n
help
The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0
@@ -202,16 +214,6 @@ config ADK_KERNEL_USB_SL811_HCD
board has this chip, and you want to use it as a host controller.
If unsure, say N.
-config ADK_KERNEL_USB_EHCI_MXC
- bool "Freescale EHCI MXC USB controller"
- depends on ADK_KERNEL_USB
- depends on ADK_TARGET_SYSTEM_KINETIS_K70
- select ADK_KERNEL_GPIOLIB
- default y if ADK_TARGET_SYSTEM_KINETIS_K70
- default n
- help
- Freescale USB controller.
-
endmenu
menu "USB devices support"