[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-105-g2c7653e
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-105-g2c7653e
|
From: Julien B a. A. <ar...@us...> - 2010-11-11 11:28:09
|
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 2c7653e66b1b3b2dcaf8d34aad23986ff677e22b (commit)
from f62c9cc7716ada745a25cfe5e7d5ebade2763601 (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 2c7653e66b1b3b2dcaf8d34aad23986ff677e22b
Author: Julien Boibessot <jul...@ar...>
Date: Thu Nov 11 12:27:35 2010 +0100
[LINUX] 2.6.36: Add minimum to boot APF51
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf51/apf51-linux-2.6.36.config | 31 +++--
.../2.6.36/400-armadeus-add_apf51_module.patch | 148 ++++++++++++++++++++
2 files changed, 168 insertions(+), 11 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
diff --git a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
index 14095b8..23dfcd1 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
+++ b/buildroot/target/device/armadeus/apf51/apf51-linux-2.6.36.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.36
-# Thu Oct 21 13:17:57 2010
+# Wed Nov 3 19:41:42 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -239,19 +239,15 @@ CONFIG_ARCH_MXC=y
# CONFIG_ARCH_MX3 is not set
# CONFIG_ARCH_MXC91231 is not set
CONFIG_ARCH_MX5=y
-# CONFIG_MACH_MX21 is not set
-# CONFIG_MACH_MX27 is not set
-# CONFIG_MACH_APF27_DEV is not set
-# CONFIG_MACH_APF27_DEV_EXT_NONE is not set
-# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
CONFIG_ARCH_MX51=y
#
# MX5 platforms:
#
-CONFIG_MACH_MX51_BABBAGE=y
+# CONFIG_MACH_MX51_BABBAGE is not set
# CONFIG_MACH_MX51_3DS is not set
# CONFIG_MACH_EUKREA_CPUIMX51 is not set
+CONFIG_MACH_ARMADEUS_APF51=y
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_TZIC=y
# CONFIG_MXC_PWM is not set
@@ -278,7 +274,7 @@ CONFIG_CPU_CP15_MMU=y
# Processor Features
#
CONFIG_ARM_THUMB=y
-# CONFIG_ARM_THUMBEE is not set
+CONFIG_ARM_THUMBEE=y
# CONFIG_CPU_ICACHE_DISABLE is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_BPREDICT_DISABLE is not set
@@ -365,7 +361,9 @@ CONFIG_CPU_IDLE_GOV_MENU=y
#
# CONFIG_FPE_NWFPE is not set
# CONFIG_FPE_FASTFPE is not set
-# CONFIG_VFP is not set
+CONFIG_VFP=y
+CONFIG_VFPv3=y
+CONFIG_NEON=y
#
# Userspace binary formats
@@ -1012,6 +1010,7 @@ CONFIG_I2C_HELPER_AUTO=y
# CONFIG_I2C_DEBUG_ALGO is not set
# CONFIG_I2C_DEBUG_BUS is not set
CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
CONFIG_SPI_MASTER=y
#
@@ -1035,6 +1034,7 @@ CONFIG_SPI_IMX=y
# CONFIG_PPS is not set
CONFIG_ARCH_REQUIRE_GPIOLIB=y
CONFIG_GPIOLIB=y
+# CONFIG_DEBUG_GPIO is not set
# CONFIG_GPIO_SYSFS is not set
#
@@ -1072,7 +1072,16 @@ CONFIG_GPIOLIB=y
# MODULbus GPIO expanders:
#
# CONFIG_W1 is not set
-# CONFIG_POWER_SUPPLY is not set
+CONFIG_POWER_SUPPLY=m
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+# CONFIG_PDA_POWER is not set
+CONFIG_WM831X_BACKUP=m
+CONFIG_WM831X_POWER=m
+# CONFIG_TEST_POWER is not set
+# CONFIG_BATTERY_DS2760 is not set
+# CONFIG_BATTERY_DS2782 is not set
+# CONFIG_BATTERY_BQ27x00 is not set
+# CONFIG_BATTERY_MAX17040 is not set
CONFIG_HWMON=m
# CONFIG_HWMON_VID is not set
# CONFIG_HWMON_DEBUG_CHIP is not set
@@ -1596,7 +1605,7 @@ CONFIG_RTC_MXC=m
# CONFIG_RTC_DRV_BQ4802 is not set
# CONFIG_RTC_DRV_RP5C01 is not set
# CONFIG_RTC_DRV_V3020 is not set
-# CONFIG_RTC_DRV_WM831X is not set
+CONFIG_RTC_DRV_WM831X=m
#
# on-CPU RTC drivers
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
new file mode 100644
index 0000000..58cf4d7
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.36/400-armadeus-add_apf51_module.patch
@@ -0,0 +1,148 @@
+Index: linux-2.6.36/arch/arm/mach-mx5/Kconfig
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/Kconfig 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-mx5/Kconfig 2010-11-11 11:32:41.000000000 +0100
+@@ -42,4 +42,10 @@
+
+ endchoice
+
++config MACH_ARMADEUS_APF51
++ bool "Support Armadeus APF51"
++ help
++ Include support for Armadeus Systems APF51 System On Module. This
++ includes specific configurations for the board and its peripherals.
++
+ endif
+Index: linux-2.6.36/arch/arm/mach-mx5/Makefile
+===================================================================
+--- linux-2.6.36.orig/arch/arm/mach-mx5/Makefile 2010-10-20 22:30:22.000000000 +0200
++++ linux-2.6.36/arch/arm/mach-mx5/Makefile 2010-11-11 11:32:41.000000000 +0100
+@@ -9,3 +9,4 @@
+ obj-$(CONFIG_MACH_MX51_3DS) += board-mx51_3ds.o
+ obj-$(CONFIG_MACH_EUKREA_CPUIMX51) += board-cpuimx51.o
+ obj-$(CONFIG_MACH_EUKREA_MBIMX51_BASEBOARD) += eukrea_mbimx51-baseboard.o
++obj-$(CONFIG_MACH_ARMADEUS_APF51) += board-apf51.o
+Index: linux-2.6.36/arch/arm/mach-mx5/board-apf51.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.36/arch/arm/mach-mx5/board-apf51.c 2010-11-11 11:32:41.000000000 +0100
+@@ -0,0 +1,97 @@
++/*
++ * Copyright 2010 Armadeus Systems
++ *
++ * Based on code which is:
++ * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved.
++ *
++ * The code contained herein is licensed under the GNU General Public
++ * License. You may obtain a copy of the GNU General Public License
++ * Version 2 or later at the following locations:
++ *
++ * http://www.opensource.org/licenses/gpl-license.html
++ * http://www.gnu.org/copyleft/gpl.html
++ */
++
++#include <linux/gpio.h>
++
++#include <asm/mach-types.h>
++#include <asm/mach/arch.h>
++#include <asm/mach/time.h>
++
++#include <mach/hardware.h>
++#include <mach/common.h>
++#include <mach/iomux-mx51.h>
++#include <mach/imx-uart.h>
++
++#include "devices.h"
++
++
++static struct pad_desc apf51_pads[] = {
++ /* UART2 (Console) */
++ MX51_PAD_UART2_RXD__UART2_RXD,
++ MX51_PAD_UART2_TXD__UART2_TXD,
++
++ /* Debug PINS */
++/* MX51_PAD_GPIO_1_2__GPIO_1_2,
++ MX51_PAD_GPIO_1_3__GPIO_1_3,*/
++};
++
++/* Serial ports */
++#if defined(CONFIG_SERIAL_IMX) || defined(CONFIG_SERIAL_IMX_MODULE)
++static struct imxuart_platform_data uart_pdata = {
++// .flags = IMXUART_HAVE_RTSCTS,
++};
++
++static inline void apf51_init_imx_uart(void)
++{
++ mxc_register_device(&mxc_uart_device1, &uart_pdata);
++}
++#else /* !SERIAL_IMX */
++static inline void apf51_init_imx_uart(void)
++{
++}
++#endif /* SERIAL_IMX */
++
++
++#define DEBUG1_GPIO (GPIO_PORTA | 2)
++#define DEBUG2_GPIO (GPIO_PORTA | 3)
++/*
++ * Board specific initialization.
++ */
++static void __init apf51_board_init(void)
++{
++ mxc_iomux_v3_setup_multiple_pads(apf51_pads,
++ ARRAY_SIZE(apf51_pads));
++
++ gpio_request(DEBUG1_GPIO, "debug1");
++ gpio_request(DEBUG2_GPIO, "debug2");
++
++ gpio_set_value(DEBUG1_GPIO, 1);
++ gpio_set_value(DEBUG2_GPIO, 1);
++
++ apf51_init_imx_uart();
++#ifdef CONFIG_MACH_ARMADEUS_APF51_BASEBOARD
++ apf51_baseboard_init();
++#endif
++}
++
++static void __init apf51_timer_init(void)
++{
++// mx51_clocks_init(32768, 0 /*24000000*/, 0 /*22579200*/, 0);
++}
++
++static struct sys_timer apf51_timer = {
++ .init = apf51_timer_init,
++};
++
++MACHINE_START(APF51, "Armadeus APF51")
++ /* Maintainer: Armadeus Systems <su...@ar...> */
++ .phys_io = MX51_AIPS1_BASE_ADDR,
++ .io_pg_offst = ((MX51_AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
++ .boot_params = PHYS_OFFSET + 0x100,
++ .map_io = mx51_map_io,
++ .init_irq = mx51_init_irq,
++ .init_machine = apf51_board_init,
++ .timer = &apf51_timer,
++MACHINE_END
++
+Index: linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h
+===================================================================
+--- linux-2.6.36.orig/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-11 12:22:51.000000000 +0100
++++ linux-2.6.36/arch/arm/plat-mxc/include/mach/uncompress.h 2010-11-11 12:23:44.000000000 +0100
+@@ -63,6 +63,7 @@
+ #define MX3X_UART1_BASE_ADDR 0x43F90000
+ #define MX3X_UART2_BASE_ADDR 0x43F94000
+ #define MX51_UART1_BASE_ADDR 0x73fbc000
++#define MX51_UART2_BASE_ADDR 0x73fc0000
+
+ static __inline__ void __arch_decomp_setup(unsigned long arch_id)
+ {
+@@ -101,6 +102,9 @@
+ case MACH_TYPE_MX51_BABBAGE:
+ uart_base = MX51_UART1_BASE_ADDR;
+ break;
++ case MACH_TYPE_APF51:
++ uart_base = MX51_UART2_BASE_ADDR;
++ break;
+ default:
+ break;
+ }
hooks/post-receive
--
armadeus
|
