diff options
| -rwxr-xr-x | scripts/install-cubox.sh | 4 | ||||
| -rw-r--r-- | target/arm/kernel/cubox-i2ultra | 4 | ||||
| -rw-r--r-- | target/arm/kernel/cubox-i4pro | 3 | ||||
| -rw-r--r-- | target/arm/sys-available/cubox-i | 1 | ||||
| -rw-r--r-- | target/config/Config.in | 3 | ||||
| -rw-r--r-- | target/linux/Config.in | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 4 | ||||
| -rw-r--r-- | target/linux/config/Config.in.i2c | 31 | ||||
| -rw-r--r-- | target/linux/config/Config.in.misc | 16 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 3 |
10 files changed, 50 insertions, 22 deletions
diff --git a/scripts/install-cubox.sh b/scripts/install-cubox.sh index bd0075d24..7a10505b2 100755 --- a/scripts/install-cubox.sh +++ b/scripts/install-cubox.sh @@ -86,8 +86,8 @@ rootsizeend=$(($rootsize+1)) echo "Install bootloader for cubox-i" parted -s $1 mklabel msdos -dd if=${3}/SPL of=${1} bs=1K seek=1 -dd if=${3}/u-boot.img of=${1} bs=1K seek=42 +dd if=${3}/SPL of=${1} bs=1K seek=1 >/dev/null 2>&1 +dd if=${3}/u-boot.img of=${1} bs=1K seek=42 >/dev/null 2>&1 parted -a optimal -s $1 unit s mkpart primary ext2 -- 2048 $rootsize parted -a optimal -s $1 unit s mkpart primary fat32 $rootsizeend $maxsize sfdisk --change-id $1 2 88 diff --git a/target/arm/kernel/cubox-i2ultra b/target/arm/kernel/cubox-i2ultra index b38283665..21f9d6ded 100644 --- a/target/arm/kernel/cubox-i2ultra +++ b/target/arm/kernel/cubox-i2ultra @@ -4,9 +4,10 @@ CONFIG_SMP=y CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_MXC=y CONFIG_ARCH_MX6=y -CONFIG_GPIO_PCA953X=y CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_LOCAL_TIMERS=y CONFIG_MXC_DEBUG_BOARD=y CONFIG_KUSER_HELPERS=y CONFIG_AEABI=y @@ -18,4 +19,3 @@ CONFIG_OF=y CONFIG_PCI_IMX6=y CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y -CONFIG_SOC_BUS=y diff --git a/target/arm/kernel/cubox-i4pro b/target/arm/kernel/cubox-i4pro index 05adab867..21f9d6ded 100644 --- a/target/arm/kernel/cubox-i4pro +++ b/target/arm/kernel/cubox-i4pro @@ -6,6 +6,9 @@ CONFIG_ARCH_MXC=y CONFIG_ARCH_MX6=y CONFIG_SOC_IMX6Q=y CONFIG_SOC_IMX6SL=y +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_LOCAL_TIMERS=y +CONFIG_MXC_DEBUG_BOARD=y CONFIG_KUSER_HELPERS=y CONFIG_AEABI=y CONFIG_VFP=y diff --git a/target/arm/sys-available/cubox-i b/target/arm/sys-available/cubox-i index c9a82d244..cd1362ecd 100644 --- a/target/arm/sys-available/cubox-i +++ b/target/arm/sys-available/cubox-i @@ -10,6 +10,7 @@ config ADK_TARGET_SYSTEM_CUBOX_I select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_I2C select ADK_TARGET_KERNEL_ZIMAGE select ADK_TARGET_WITH_ROOT_RW select ADK_PACKAGE_U_BOOT_IMX6 diff --git a/target/config/Config.in b/target/config/Config.in index 15ace24da..09fff28da 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -384,6 +384,9 @@ endchoice config ADK_TARGET_WITH_USB boolean +config ADK_TARGET_WITH_I2C + boolean + config ADK_TARGET_WITH_PCI boolean diff --git a/target/linux/Config.in b/target/linux/Config.in index 50b35ebcd..e44412ae8 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -21,8 +21,9 @@ source target/linux/config/Config.in.lib source target/linux/config/Config.in.pm source target/linux/config/Config.in.spi source target/linux/config/Config.in.kvm -source target/linux/config/Config.in.debug source target/linux/config/Config.in.virtio source target/linux/config/Config.in.regulator source target/linux/config/Config.in.gpio +source target/linux/config/Config.in.i2c source target/linux/config/Config.in.dma +source target/linux/config/Config.in.debug diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 7cf30c49c..54f129665 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -71,6 +71,9 @@ config ADK_KERNEL_SATA_AHCI_PLATFORM config ADK_KERNEL_SATA_PMP boolean +config ADK_KERNEL_AHCI_IMX + boolean + config ADK_KERNEL_CONNECTOR boolean @@ -156,6 +159,7 @@ config ADK_KERNEL_PATA_IMX select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD select ADK_KERNEL_ATA + select ADK_KERNEL_AHCI_IMX select ADK_KERNEL_SATA_PMP select ADK_KERNEL_SATA_AHCI_PLATFORM default y if ADK_TARGET_SYSTEM_CUBOX_I diff --git a/target/linux/config/Config.in.i2c b/target/linux/config/Config.in.i2c new file mode 100644 index 000000000..8b67aca72 --- /dev/null +++ b/target/linux/config/Config.in.i2c @@ -0,0 +1,31 @@ +config ADK_KERNEL_I2C + boolean + +config ADK_KERNEL_I2C_CHARDEV + boolean + +menu "I2C driver support" +depends on ADK_TARGET_WITH_I2C + +config ADK_KERNEL_I2C_IMX + prompt ".................................. I2C driver for cubox-i" + boolean + select ADK_KERNEL_I2C + select ADK_KERNEL_I2C_CHARDEV + default y if ADK_TARGET_SYSTEM_CUBOX_I + default n + depends on ADK_TARGET_SYSTEM_CUBOX_I + help + I2C driver for cubox-i. + +config ADK_KPACKAGE_KMOD_SCx200_ACB + prompt "kmod-i2c-geode.................... I2C driver for Geode" + tristate + select ADK_KERNEL_I2C + select ADK_KERNEL_I2C_CHARDEV + default n + depends on ADK_CPU_GEODE + help + I2C driver for Geode boards. + +endmenu diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index 4cec8450a..2a42745ea 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -25,12 +25,6 @@ config ADK_KPACKAGE_KMOD_REGMAP_MMIO config ADK_KERNEL_KEYS boolean -config ADK_KERNEL_I2C - boolean - -config ADK_KERNEL_I2C_CHARDEV - tristate - config ADK_KERNEL_RTC_CLASS boolean @@ -87,16 +81,6 @@ config ADK_KERNEL_RTC_DRV_CMOS help PC CMOS RTC support. -config ADK_KPACKAGE_KMOD_SCx200_ACB - prompt "kmod-i2c-geode.................... I2C driver for Geode" - tristate - select ADK_KERNEL_I2C - select ADK_KERNEL_I2C_CHARDEV - default n - depends on ADK_CPU_GEODE - help - I2C driver for Geode boards. - config ADK_KPACKAGE_KMOD_PARPORT prompt "kmod-parport...................... generic parallel port support" tristate diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index ce27345cd..a5e9c0149 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -57,6 +57,7 @@ config ADK_KPACKAGE_KMOD_USB default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_ACMESYSTEMS_FOXG20 + default y if ADK_TARGET_SYSTEM_CUBOX_I default n help Universal Serial Bus (USB) is a specification for a serial bus @@ -180,6 +181,7 @@ config ADK_KPACKAGE_KMOD_USB_EHCI_HCD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX2D13 default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG + default y if ADK_TARGET_SYSTEM_CUBOX_I default n help The Enhanced Host Controller Interface (EHCI) is standard for USB 2.0 @@ -246,7 +248,6 @@ config ADK_KPACKAGE_KMOD_USB_SERIAL information on the specifics of the different devices that are supported, and on how to use them. - config ADK_KPACKAGE_KMOD_USB_SERIAL_BELKIN prompt "kmod-usb-serial-belkin.......... Support for Belkin USB-to-serial converters" tristate |