[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-410-g92daa71
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.1-410-g92daa71
|
From: Julien B a. A. <ar...@us...> - 2012-06-22 19:55:06
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 92daa7130d8180c96fb0c40bd47a17bccc06e3b5 (commit)
via 482c0159536e05c7b13dac8c6efa3baf141090a4 (commit)
via b0a8f515ee23fee6f5dde7350784995040c4e6a4 (commit)
from 967dd939ccce0d8f36d805f13f87b9da9420d908 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 92daa7130d8180c96fb0c40bd47a17bccc06e3b5
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 22 21:49:54 2012 +0200
[LINUX] 3.4: refresh APF28 patches
commit 482c0159536e05c7b13dac8c6efa3baf141090a4
Merge: b0a8f51 967dd93
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 22 21:46:56 2012 +0200
Merge branch 'master' of ssh://armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit b0a8f515ee23fee6f5dde7350784995040c4e6a4
Author: Julien Boibessot <jul...@ar...>
Date: Fri Jun 22 21:46:18 2012 +0200
(LINUX] Add very preliminary and very light support of 3.4.2 Linux kernel for APF27
-----------------------------------------------------------------------
Summary of changes:
.../device/armadeus/apf27/apf27-linux-3.4.2.config | 1 +
...-linux-2.6.38.config => apf27-linux-3.4.config} | 50 +--
.../linux/3.4/200-armadeus-add_apf27_module.patch | 341 ++++++++++++++++++++
.../450-armadeus-add_apf28_module_support.patch | 26 +-
...1-armadeus-add_apf28dev_baseboard_support.patch | 26 +-
5 files changed, 386 insertions(+), 58 deletions(-)
create mode 120000 buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config
copy buildroot/target/device/armadeus/apf27/{apf27-linux-2.6.38.config => apf27-linux-3.4.config} (85%)
create mode 100644 patches/linux/3.4/200-armadeus-add_apf27_module.patch
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config
new file mode 120000
index 0000000..7beb63d
--- /dev/null
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.2.config
@@ -0,0 +1 @@
+apf27-linux-3.4.config
\ No newline at end of file
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config b/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.config
similarity index 85%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
copy to buildroot/target/device/armadeus/apf27/apf27-linux-3.4.config
index 812e771..ccd6313 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.38.config
+++ b/buildroot/target/device/armadeus/apf27/apf27-linux-3.4.config
@@ -4,9 +4,7 @@ CONFIG_EXPERIMENTAL=y
CONFIG_SYSVIPC=y
CONFIG_POSIX_MQUEUE=y
CONFIG_LOG_BUF_SHIFT=14
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_EMBEDDED=y
-CONFIG_KALLSYMS_EXTRA_PASS=y
# CONFIG_COMPAT_BRK is not set
CONFIG_SLAB=y
CONFIG_PROFILING=y
@@ -14,10 +12,12 @@ CONFIG_OPROFILE=y
CONFIG_MODULES=y
CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+CONFIG_BSD_DISKLABEL=y
# CONFIG_IOSCHED_CFQ is not set
CONFIG_ARCH_MXC=y
-CONFIG_ARCH_MX2=y
-CONFIG_MACH_MX27=y
+CONFIG_ARCH_IMX_V4_V5=y
+CONFIG_MACH_IMX27_DT=y
CONFIG_MACH_APF27=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
@@ -27,9 +27,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0
CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CPU_IDLE=y
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM=y
CONFIG_PM_DEBUG=y
-CONFIG_PM_VERBOSE=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
@@ -46,12 +44,8 @@ CONFIG_CAN=m
CONFIG_CAN_RAW=m
CONFIG_CAN_BCM=m
CONFIG_CAN_VCAN=m
-CONFIG_CAN_DEV=m
-CONFIG_CAN_CALC_BITTIMING=y
CONFIG_CAN_MCP251X=m
CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
CONFIG_BT_RFCOMM=m
CONFIG_BT_RFCOMM_TTY=y
CONFIG_BT_BNEP=m
@@ -68,14 +62,11 @@ CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_FW_LOADER=m
CONFIG_MTD=y
-CONFIG_MTD_PARTITIONS=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_CHAR=y
CONFIG_MTD_BLOCK=y
CONFIG_MTD_NAND=y
-CONFIG_MTD_NAND_MXC=y
CONFIG_MTD_UBI=y
-CONFIG_MISC_DEVICES=y
CONFIG_EEPROM_AT24=y
CONFIG_EEPROM_AT25=y
CONFIG_SCSI=y
@@ -88,11 +79,19 @@ CONFIG_SCSI_MULTI_LUN=y
CONFIG_SCSI_LOGGING=y
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_NETDEVICES=y
+# CONFIG_NET_VENDOR_BROADCOM is not set
+# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
+# CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_MARVELL is not set
+# CONFIG_NET_VENDOR_MICREL is not set
+# CONFIG_NET_VENDOR_MICROCHIP is not set
+# CONFIG_NET_VENDOR_NATSEMI is not set
+# CONFIG_NET_VENDOR_SEEQ is not set
+# CONFIG_NET_VENDOR_SMSC is not set
+# CONFIG_NET_VENDOR_STMICRO is not set
CONFIG_SMSC_PHY=y
-CONFIG_NET_ETHERNET=y
-CONFIG_FEC=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
CONFIG_RTL8187=m
CONFIG_LIBERTAS=m
CONFIG_LIBERTAS_SDIO=m
@@ -103,33 +102,27 @@ CONFIG_INPUT_JOYDEV=y
CONFIG_INPUT_EVDEV=y
CONFIG_KEYBOARD_IMX=m
CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_TSC2102=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
+# CONFIG_LEGACY_PTYS is not set
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
# CONFIG_HW_RANDOM is not set
CONFIG_I2C=y
CONFIG_I2C_CHARDEV=y
CONFIG_I2C_IMX=y
CONFIG_SPI=y
CONFIG_SPI_IMX=y
-CONFIG_SPI_MXC_SELECT2=y
CONFIG_SPI_SPIDEV=m
CONFIG_GPIO_SYSFS=y
CONFIG_HWMON=m
CONFIG_WATCHDOG=y
-CONFIG_IMX2_WDT=m
CONFIG_MEDIA_SUPPORT=m
CONFIG_VIDEO_DEV=m
# CONFIG_RC_CORE is not set
# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_SOC_CAMERA=m
-CONFIG_VIDEO_MX2=m
# CONFIG_RADIO_ADAPTERS is not set
CONFIG_FB=y
-CONFIG_FB_IMX=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_BACKLIGHT_GENERIC is not set
@@ -164,12 +157,8 @@ CONFIG_USB_WDM=y
CONFIG_USB_STORAGE=y
CONFIG_USB_GADGET=y
CONFIG_USB_GADGET_DEBUG_FILES=y
-CONFIG_USB_ETH=y
+CONFIG_USB_ETH=m
CONFIG_USB_ULPI=y
-CONFIG_ARMADEUS_DRIVERS=y
-CONFIG_ARMADEUS_MAX1027=m
-CONFIG_ARMADEUS_FPGA_DRIVERS=y
-CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
CONFIG_MMC=y
CONFIG_MMC_MXC=y
CONFIG_RTC_CLASS=y
@@ -199,12 +188,9 @@ CONFIG_NFS_FS=y
CONFIG_NFS_V3=y
CONFIG_NFS_V4=y
CONFIG_ROOT_NFS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
CONFIG_NLS_CODEPAGE_437=y
CONFIG_NLS_CODEPAGE_850=y
CONFIG_NLS_ISO8859_1=y
CONFIG_DEBUG_FS=y
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
# CONFIG_CRYPTO_ANSI_CPRNG is not set
# CONFIG_CRYPTO_HW is not set
diff --git a/patches/linux/3.4/200-armadeus-add_apf27_module.patch b/patches/linux/3.4/200-armadeus-add_apf27_module.patch
new file mode 100644
index 0000000..5dd4487
--- /dev/null
+++ b/patches/linux/3.4/200-armadeus-add_apf27_module.patch
@@ -0,0 +1,341 @@
+The APF27 is an i.M27 based SOM (System On Module) that can be plugged on
+several docking/development boards. Here only basic module support
+is added (Ethernet, Serial, NAND Flash, USB OTG).
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Signed-off-by: Nicolas Colombain <nic...@ar...>
+---
+ arch/arm/mach-imx/Kconfig | 13 ++
+ arch/arm/mach-imx/Makefile | 1 +
+ arch/arm/mach-imx/mach-apf27.c | 258 +++++++++++++++++++++++++++
+ arch/arm/plat-mxc/include/mach/uncompress.h | 1 +
+ 4 files changed, 273 insertions(+), 0 deletions(-)
+ create mode 100644 arch/arm/mach-imx/mach-apf27.c
+
+Index: linux-3.4.2/arch/arm/mach-imx/Kconfig
+===================================================================
+--- linux-3.4.2.orig/arch/arm/mach-imx/Kconfig 2012-06-22 21:18:10.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-imx/Kconfig 2012-06-22 21:18:15.000000000 +0200
+@@ -375,6 +375,20 @@
+ Include support for Freescale i.MX27 based platforms
+ using the device tree for discovery
+
++config MACH_APF27
++ bool "Armadeus Systems APF27"
++ select SOC_IMX27
++ select IMX_HAVE_PLATFORM_FSL_USB2_UDC
++ select IMX_HAVE_PLATFORM_MXC_EHCI
++ select IMX_HAVE_PLATFORM_IMX2_WDT
++ select IMX_HAVE_PLATFORM_IMX_I2C
++ select IMX_HAVE_PLATFORM_IMX_UART
++ select IMX_HAVE_PLATFORM_MXC_NAND
++ select MXC_ULPI if USB_ULPI
++ help
++ Include support for APF27 platform. This includes specific
++ configurations for the module and its peripherals.
++
+ endif
+
+ if ARCH_IMX_V6_V7
+Index: linux-3.4.2/arch/arm/mach-imx/Makefile
+===================================================================
+--- linux-3.4.2.orig/arch/arm/mach-imx/Makefile 2012-06-22 21:18:10.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-imx/Makefile 2012-06-22 21:18:15.000000000 +0200
+@@ -40,6 +40,7 @@
+ obj-$(CONFIG_MACH_MXT_TD60) += mach-mxt_td60.o
+ obj-$(CONFIG_MACH_IMX27IPCAM) += mach-imx27ipcam.o
+ obj-$(CONFIG_MACH_IMX27_DT) += imx27-dt.o
++obj-$(CONFIG_MACH_APF27) += mach-apf27.o
+
+ # i.MX31 based machines
+ obj-$(CONFIG_MACH_MX31ADS) += mach-mx31ads.o
+Index: linux-3.4.2/arch/arm/mach-imx/mach-apf27.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-3.4.2/arch/arm/mach-imx/mach-apf27.c 2012-06-22 21:28:41.000000000 +0200
+@@ -0,0 +1,260 @@
++ /*
++ * Support for the APF27 System On Module
++ *
++ * Copyright (C) 2008-2012 Armadeus Systems <su...@ar...>
++ *
++ * Based on code which is:
++ * Copyright 2007 Robert Schwebel <r.s...@pe...>, Pengutronix
++ * Copyright (C) 2008 Juergen Beisert (ke...@pe...)
++ * Copyright 2009 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
++ * MA 02110-1301, USA.
++ */
++
++#include <linux/platform_device.h>
++#include <linux/i2c.h>
++#include <linux/serial.h>
++#include <linux/delay.h>
++#include <linux/clk.h>
++#include <linux/usb/otg.h>
++#include <linux/usb/ulpi.h>
++#include <linux/phy.h>
++
++#include <asm/mach/flash.h>
++#include <asm/mach/arch.h>
++#include <asm/mach-types.h>
++#include <asm/mach/time.h>
++#include <mach/common.h>
++#include <mach/hardware.h>
++#include <mach/iomux-mx27.h>
++#include <mach/gpio.h>
++#include <mach/imx-uart.h>
++#include <mach/mxc_nand.h>
++#include <mach/mxc_ehci.h>
++#include <mach/ulpi.h>
++
++#include "devices-imx27.h"
++
++
++static const int apf27_pins[] __initconst = {
++ /* UART1 */
++ PE12_PF_UART1_TXD,
++ PE13_PF_UART1_RXD,
++ /* USB_OTG */
++ PE0_PF_USBOTG_NXT,
++ PE1_PF_USBOTG_STP,
++ PE2_PF_USBOTG_DIR,
++ PE24_PF_USBOTG_CLK,
++ PE25_PF_USBOTG_DATA7,
++ PC7_PF_USBOTG_DATA5,
++ PC8_PF_USBOTG_DATA6,
++ PC9_PF_USBOTG_DATA0,
++ PC10_PF_USBOTG_DATA2,
++ PC11_PF_USBOTG_DATA1,
++ PC12_PF_USBOTG_DATA4,
++ PC13_PF_USBOTG_DATA3,
++ /* UART3 */
++ PE8_PF_UART3_TXD,
++ PE9_PF_UART3_RXD,
++ PE10_PF_UART3_CTS,
++ PE11_PF_UART3_RTS,
++ /* ETHERNET */
++ PD0_AIN_FEC_TXD0,
++ PD1_AIN_FEC_TXD1,
++ PD2_AIN_FEC_TXD2,
++ PD3_AIN_FEC_TXD3,
++ PD4_AOUT_FEC_RX_ER,
++ PD5_AOUT_FEC_RXD1,
++ PD6_AOUT_FEC_RXD2,
++ PD7_AOUT_FEC_RXD3,
++ PD8_AF_FEC_MDIO,
++ PD9_AIN_FEC_MDC,
++ PD10_AOUT_FEC_CRS,
++ PD11_AOUT_FEC_TX_CLK,
++ PD12_AOUT_FEC_RXD0,
++ PD13_AOUT_FEC_RX_DV,
++ PD14_AOUT_FEC_RX_CLK,
++ PD15_AOUT_FEC_COL,
++ PD16_AIN_FEC_TX_ER,
++ PF23_AIN_FEC_TX_EN,
++ /* I2C2 */
++ PC5_PF_I2C2_SDA,
++ PC6_PF_I2C2_SCL,
++};
++
++/* APF27 has an "on module" Ethernet transceiver */
++int lan8700_wakeup(struct phy_device *phydev)
++{
++#define LAN87xx_SPECIAL_REG 0x12
++
++ int rc = phy_read(phydev, LAN87xx_SPECIAL_REG);
++
++ phy_write(phydev, LAN87xx_SPECIAL_REG, rc | 0xE0);
++ phy_write(phydev, MII_BMCR, BMCR_RESET);
++ udelay(1000);
++ return 0;
++}
++
++/* APF27 has a Micron 128MiB 1,8V NAND flash, 16 bits width */
++static const struct mxc_nand_platform_data apf27_nand_board_info __initconst = {
++ .width = 2,
++ .hw_ecc = 1,
++ .flash_bbt = 1, /* we handle Bad Block Table */
++};
++
++/* APF27 has an I2C EEPROM on I2C2 Bus */
++static const struct imxi2c_platform_data apf27_i2c_1_data __initconst = {
++ .bitrate = 100000,
++};
++
++static struct i2c_board_info apf27_i2c_devices_bus1[] = {
++ {
++ I2C_BOARD_INFO("24c02", 0x50),
++ },
++};
++
++/* APF27 has an RS232 debug port/console on UART1 with "on module"
++ transceiver */
++static struct imxuart_platform_data uart0_pdata = {
++ .flags = 0,
++};
++
++/* APF27 has an "on module" transceiver for UART3 */
++static struct imxuart_platform_data uart2_pdata = {
++ .flags = IMXUART_HAVE_RTSCTS,
++};
++
++/* APF27 has an "on module" transceiver for USB OTG */
++static int otg_mode_host = 1;
++
++static int __init apf27_otg_mode(char *options)
++{
++ if (!strcmp(options, "host"))
++ otg_mode_host = 1;
++ else if (!strcmp(options, "device"))
++ otg_mode_host = 0;
++ else
++ pr_info("otg_mode neither \"host\" nor \"device\". "
++ "Defaulting to host\n");
++
++ return 0;
++}
++__setup("otg_mode=", apf27_otg_mode);
++
++static void apf27_usbotg_phy_init(void)
++{
++#define USBCTRL_OFFSET 0x600
++#define USBCTRL_UIE_BIT (1 << 28)
++#define USBCTRL_WIE_BIT (1 << 27)
++#define USBCMD_OFFSET 0x140
++#define USBCMD_RST_BIT (1 << 1)
++#define PORTSC1_OFFSET 0x184
++#define PORTSC_PTS_MASK (3 << 30)
++#define PORTSC_PTS_ULPI (2 << 30)
++
++ unsigned int reg;
++
++ /* Tweak power/wake up handling */
++ reg = readl(MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + USBCTRL_OFFSET);
++ reg |= USBCTRL_WIE_BIT | USBCTRL_UIE_BIT;
++ writel(reg, MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + USBCTRL_OFFSET);
++
++ /* Select ULPI PHY */
++ reg = readl(MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + PORTSC1_OFFSET);
++ reg = (reg & ~PORTSC_PTS_MASK) | PORTSC_PTS_ULPI;
++ writel(reg, MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + PORTSC1_OFFSET);
++ mdelay(10);
++
++ /* Reset PHY */
++ reg = readl(MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + USBCMD_OFFSET);
++ reg |= USBCMD_RST_BIT;
++ writel(reg, MX27_IO_ADDRESS(MX27_USB_BASE_ADDR) + USBCMD_OFFSET);
++ mdelay(10);
++}
++
++static int apf27_otg_init(struct platform_device *pdev)
++{
++ int ret;
++
++ ret = mx27_initialize_usb_hw(pdev->id, MXC_EHCI_INTERFACE_DIFF_UNI);
++ apf27_usbotg_phy_init(); /* PHY is in powerdown mode by default */
++
++ return ret;
++}
++
++static struct mxc_usbh_platform_data otg_pdata __initdata = {
++ .init = apf27_otg_init,
++ .portsc = MXC_EHCI_MODE_ULPI,
++};
++
++static const struct fsl_usb2_platform_data otg_device_pdata __initconst = {
++ .operating_mode = FSL_USB2_DR_DEVICE,
++ .phy_mode = FSL_USB2_PHY_ULPI,
++};
++
++static void __init apf27_init(void)
++{
++ int ret;
++
++ ret = mxc_gpio_setup_multiple_pins(apf27_pins,
++ ARRAY_SIZE(apf27_pins), "APF27");
++ if (ret)
++ printk(KERN_ERR "apf27: Failed to setup pins (%d)\n", ret);
++
++ imx27_add_imx_uart0(&uart0_pdata);
++ imx27_add_imx_uart2(&uart2_pdata);
++
++ /* bring lan8700 out of power down mode */
++ phy_register_fixup_for_id("1:1f", lan8700_wakeup);
++ imx27_add_fec(NULL);
++
++ imx27_add_mxc_nand(&apf27_nand_board_info);
++
++ imx27_add_imx2_wdt(NULL);
++
++ if (otg_mode_host) {
++ otg_pdata.otg = imx_otg_ulpi_create(ULPI_OTG_DRVVBUS |
++ ULPI_OTG_DRVVBUS_EXT);
++ if (otg_pdata.otg)
++ imx27_add_mxc_ehci_otg(&otg_pdata);
++ }
++ if (!otg_mode_host)
++ imx27_add_fsl_usb2_udc(&otg_device_pdata);
++
++ i2c_register_board_info(1, apf27_i2c_devices_bus1,
++ ARRAY_SIZE(apf27_i2c_devices_bus1));
++ imx27_add_imx_i2c(1, &apf27_i2c_1_data);
++}
++
++static void __init apf27_timer_init(void)
++{
++ mx27_clocks_init(26000000); /* init ext ref, even if not used */
++}
++
++static struct sys_timer apf27_timer = {
++ .init = apf27_timer_init,
++};
++
++MACHINE_START(APF27, "Armadeus APF27")
++ /* Maintainer: Julien Boibessot <jul...@ar...> */
++ .atag_offset = 0x100,
++ .map_io = mx27_map_io,
++ .init_early = imx27_init_early,
++ .init_irq = mx27_init_irq,
++ .handle_irq = imx27_handle_irq,
++ .timer = &apf27_timer,
++ .init_machine = apf27_init,
++ .restart = mxc_restart,
++MACHINE_END
+Index: linux-3.4.2/arch/arm/plat-mxc/include/mach/uncompress.h
+===================================================================
+--- linux-3.4.2.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2012-06-22 21:18:10.000000000 +0200
++++ linux-3.4.2/arch/arm/plat-mxc/include/mach/uncompress.h 2012-06-22 21:18:15.000000000 +0200
+@@ -85,6 +85,7 @@
+ case MACH_TYPE_PCA100:
+ case MACH_TYPE_MXT_TD60:
+ case MACH_TYPE_IMX27IPCAM:
++ case MACH_TYPE_APF27:
+ uart_base = MX2X_UART1_BASE_ADDR;
+ break;
+ case MACH_TYPE_MX31LITE:
+Index: linux-3.4.2/arch/arm/tools/mach-types
+===================================================================
+--- linux-3.4.2.orig/arch/arm/tools/mach-types 2012-06-22 21:18:10.000000000 +0200
++++ linux-3.4.2/arch/arm/tools/mach-types 2012-06-22 21:18:15.000000000 +0200
+@@ -298,6 +298,7 @@
+ wbd111 MACH_WBD111 WBD111 1690
+ mv2120 MACH_MV2120 MV2120 1693
+ mx51_3ds MACH_MX51_3DS MX51_3DS 1696
++apf27 MACH_APF27 APF27 1698
+ imx27lite MACH_IMX27LITE IMX27LITE 1701
+ usb_a9260 MACH_USB_A9260 USB_A9260 1709
+ usb_a9263 MACH_USB_A9263 USB_A9263 1710
diff --git a/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch b/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
index 42e147c..a139663 100644
--- a/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
+++ b/patches/linux/3.4/450-armadeus-add_apf28_module_support.patch
@@ -2,13 +2,13 @@ Add Armadeus systems APF28 SOM support.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-3.3.5/arch/arm/mach-mxs/Kconfig
+Index: linux-3.4.2/arch/arm/mach-mxs/Kconfig
===================================================================
---- linux-3.3.5.orig/arch/arm/mach-mxs/Kconfig 2012-05-07 17:55:30.000000000 +0200
-+++ linux-3.3.5/arch/arm/mach-mxs/Kconfig 2012-05-08 14:59:27.000000000 +0200
-@@ -91,4 +91,13 @@
- bool "Support DENX M28EVK Platform"
- select MODULE_M28
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Kconfig 2012-06-22 21:47:32.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/Kconfig 2012-06-22 21:47:40.000000000 +0200
+@@ -107,4 +107,13 @@
+ bool "Support Bluegiga APX4 Development Kit"
+ select MODULE_APX4
+config MACH_APF28
+ bool "Armadeus APF28 module"
@@ -20,21 +20,21 @@ Index: linux-3.3.5/arch/arm/mach-mxs/Kconfig
+ specific configurations for the module and its peripherals.
+
endif
-Index: linux-3.3.5/arch/arm/mach-mxs/Makefile
+Index: linux-3.4.2/arch/arm/mach-mxs/Makefile
===================================================================
---- linux-3.3.5.orig/arch/arm/mach-mxs/Makefile 2012-05-07 17:55:30.000000000 +0200
-+++ linux-3.3.5/arch/arm/mach-mxs/Makefile 2012-05-08 14:59:27.000000000 +0200
-@@ -13,5 +13,6 @@
- obj-$(CONFIG_MACH_M28EVK) += mach-m28evk.o
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Makefile 2012-06-22 21:47:32.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/Makefile 2012-06-22 21:47:40.000000000 +0200
+@@ -14,5 +14,6 @@
+ obj-$(CONFIG_MACH_APX4DEVKIT) += mach-apx4devkit.o
obj-$(CONFIG_MODULE_TX28) += module-tx28.o
obj-$(CONFIG_MACH_TX28) += mach-tx28.o
+obj-$(CONFIG_MACH_APF28) += mach-apf28.o
obj-y += devices/
-Index: linux-3.3.5/arch/arm/mach-mxs/mach-apf28.c
+Index: linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.3.5/arch/arm/mach-mxs/mach-apf28.c 2012-05-08 14:59:27.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c 2012-06-22 21:47:40.000000000 +0200
@@ -0,0 +1,106 @@
+/*
+ * Copyright 2011 Armadeus systems.
diff --git a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
index cd85c31..b6c905c 100644
--- a/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
+++ b/patches/linux/3.4/451-armadeus-add_apf28dev_baseboard_support.patch
@@ -2,11 +2,11 @@ Add Armadeus systems APF28Dev development board support.
Signed-off-by: Julien Boibessot <jul...@ar...>
-Index: linux-3.1/arch/arm/mach-mxs/Kconfig
+Index: linux-3.4.2/arch/arm/mach-mxs/Kconfig
===================================================================
---- linux-3.1.orig/arch/arm/mach-mxs/Kconfig 2011-11-09 15:52:13.000000000 +0100
-+++ linux-3.1/arch/arm/mach-mxs/Kconfig 2011-11-09 15:53:11.000000000 +0100
-@@ -77,4 +77,21 @@
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Kconfig 2012-06-22 21:47:40.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/Kconfig 2012-06-22 21:47:48.000000000 +0200
+@@ -116,4 +116,21 @@
Include support for the Armadeus systems APF28 SOM. This includes
specific configurations for the module and its peripherals.
@@ -28,21 +28,21 @@ Index: linux-3.1/arch/arm/mach-mxs/Kconfig
+ at runtime.
+
endif
-Index: linux-3.1/arch/arm/mach-mxs/Makefile
+Index: linux-3.4.2/arch/arm/mach-mxs/Makefile
===================================================================
---- linux-3.1.orig/arch/arm/mach-mxs/Makefile 2011-11-09 15:52:13.000000000 +0100
-+++ linux-3.1/arch/arm/mach-mxs/Makefile 2011-11-09 15:53:11.000000000 +0100
-@@ -13,5 +13,6 @@
+--- linux-3.4.2.orig/arch/arm/mach-mxs/Makefile 2012-06-22 21:47:40.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/Makefile 2012-06-22 21:47:48.000000000 +0200
+@@ -15,5 +15,6 @@
obj-$(CONFIG_MODULE_TX28) += module-tx28.o
obj-$(CONFIG_MACH_TX28) += mach-tx28.o
obj-$(CONFIG_MACH_APF28) += mach-apf28.o
+obj-$(CONFIG_MACH_APF28_DEV) += apf28dev-baseboard.o
obj-y += devices/
-Index: linux-3.1/arch/arm/mach-mxs/apf28dev-baseboard.c
+Index: linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ linux-3.1/arch/arm/mach-mxs/apf28dev-baseboard.c 2011-11-09 15:53:11.000000000 +0100
++++ linux-3.4.2/arch/arm/mach-mxs/apf28dev-baseboard.c 2012-06-22 21:47:48.000000000 +0200
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2011 Armadeus systems.
@@ -245,10 +245,10 @@ Index: linux-3.1/arch/arm/mach-mxs/apf28dev-baseboard.c
+ mx28_add_mxs_mmc(0, &apf28dev_mmc0_pdata);
+}
+EXPORT_SYMBOL_GPL(apf28dev_init);
-Index: linux-3.1/arch/arm/mach-mxs/mach-apf28.c
+Index: linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c
===================================================================
---- linux-3.1.orig/arch/arm/mach-mxs/mach-apf28.c 2011-11-09 15:53:02.000000000 +0100
-+++ linux-3.1/arch/arm/mach-mxs/mach-apf28.c 2011-11-09 15:53:11.000000000 +0100
+--- linux-3.4.2.orig/arch/arm/mach-mxs/mach-apf28.c 2012-06-22 21:47:40.000000000 +0200
++++ linux-3.4.2/arch/arm/mach-mxs/mach-apf28.c 2012-06-22 21:47:48.000000000 +0200
@@ -78,6 +78,17 @@
.phy = PHY_INTERFACE_MODE_RMII,
};
hooks/post-receive
--
armadeus
|
