[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-79-g038a316
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.3-79-g038a316
|
From: jscheer <js...@us...> - 2010-11-03 13:23:44
|
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 038a3161e18a65036366f93227250cd457ff3bec (commit)
via 463f1696a826e0108fb546553d61cdce87cd20a0 (commit)
from 4de40f3390aa73f124b2a9c251d70ca237381ed3 (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 038a3161e18a65036366f93227250cd457ff3bec
Merge: 463f1696a826e0108fb546553d61cdce87cd20a0 4de40f3390aa73f124b2a9c251d70ca237381ed3
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Nov 3 14:22:34 2010 +0100
Merge branch 'master' of ssh://jscheer@armadeus.git.sourceforge.net/gitroot/armadeus/armadeus
commit 463f1696a826e0108fb546553d61cdce87cd20a0
Author: Jeremie Scheer <jer...@ar...>
Date: Wed Nov 3 14:21:40 2010 +0100
[BUILD] Add PPS board configs : Linux, Buildroot, UBoot & uClibc config files and PPS baseboard kernel patch.
-----------------------------------------------------------------------
Summary of changes:
.../configs/{apf27_defconfig => pps_defconfig} | 64 +---
.../500-pps-armadeus-add_pps_baseboard.patch | 369 ++++++++++++++++++++
.../device/armadeus/{apf27 => pps}/Config.in | 0
.../device/armadeus/{apf27 => pps}/Makefile.in | 0
.../{apf27/apf27.h => pps/apf27-u-boot-1.3.4.h} | 9 +-
.../target/device/armadeus/{apf27 => pps}/apf27.h | 9 +-
.../pps-linux-2.6.29.config} | 264 +++------------
.../{apf27/apf27_defconfig => pps/pps_defconfig} | 75 +++--
.../{apf51 => pps}/uClibc-0.9.30.config.arm | 5 +-
.../armadeus/{apf27 => pps}/uClibc.config.arm | 0
10 files changed, 482 insertions(+), 313 deletions(-)
copy buildroot/configs/{apf27_defconfig => pps_defconfig} (92%)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
copy buildroot/target/device/armadeus/{apf27 => pps}/Config.in (100%)
copy buildroot/target/device/armadeus/{apf27 => pps}/Makefile.in (100%)
copy buildroot/target/device/armadeus/{apf27/apf27.h => pps/apf27-u-boot-1.3.4.h} (99%)
copy buildroot/target/device/armadeus/{apf27 => pps}/apf27.h (99%)
copy buildroot/target/device/armadeus/{apf27/apf27-linux-2.6.29.config => pps/pps-linux-2.6.29.config} (86%)
copy buildroot/target/device/armadeus/{apf27/apf27_defconfig => pps/pps_defconfig} (95%)
copy buildroot/target/device/armadeus/{apf51 => pps}/uClibc-0.9.30.config.arm (98%)
copy buildroot/target/device/armadeus/{apf27 => pps}/uClibc.config.arm (100%)
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/pps_defconfig
similarity index 92%
copy from buildroot/configs/apf27_defconfig
copy to buildroot/configs/pps_defconfig
index dae7f48..3f45829 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -1,7 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Nov 1 17:03:11 2010
-#
+# Tue Oct 26 15:33:44 2010
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="2010.11-git"
BR2_arm=y
@@ -58,7 +57,7 @@ BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
BR2_TARGET_ARMADEUS_APF27=y
# BR2_TARGET_ARMADEUS_APF51 is not set
-BR2_BOARD_NAME="apf27"
+BR2_BOARD_NAME="pps"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
# BR2_TARGET_ARMADEUS_APF27_SDRAM_16 is not set
@@ -250,41 +249,7 @@ BR2_PACKAGE_MAX5821CTRL=y
#
# Audio and video libraries and applications
#
-BR2_PACKAGE_ALSA_LIB=y
-
-#
-# ALSA lib selection
-#
-BR2_PACKAGE_ALSA_LIB_DEVDIR="/dev/snd"
-BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS="all"
-BR2_PACKAGE_ALSA_LIB_ALOAD=y
-BR2_PACKAGE_ALSA_LIB_MIXER=y
-BR2_PACKAGE_ALSA_LIB_PCM=y
-BR2_PACKAGE_ALSA_LIB_RAWMIDI=y
-BR2_PACKAGE_ALSA_LIB_HWDEP=y
-BR2_PACKAGE_ALSA_LIB_SEQ=y
-BR2_PACKAGE_ALSA_LIB_ALISP=y
-BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
-BR2_PACKAGE_ALSA_UTILS=y
-
-#
-# ALSA utils selection
-#
-# BR2_PACKAGE_ALSA_UTILS_ALSACONF is not set
-BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
-BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
-# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_ARECORD=y
-# BR2_PACKAGE_ALSA_UTILS_IECSET is not set
-# BR2_PACKAGE_ALSA_UTILS_ACONNECT is not set
-# BR2_PACKAGE_ALSA_UTILS_APLAYMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+# BR2_PACKAGE_ALSA_LIB is not set
# BR2_PACKAGE_AUMIX is not set
# BR2_PACKAGE_FLAC is not set
# BR2_PACKAGE_FLITE is not set
@@ -354,7 +319,7 @@ BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_LIBMPFR is not set
# BR2_PACKAGE_LIBTOOL is not set
# BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_PKG_CONFIG is not set
+BR2_PACKAGE_PKG_CONFIG=y
#
# Games
@@ -589,7 +554,7 @@ BR2_PACKAGE_ZLIB=y
#
# BR2_PACKAGE_LIBAIO is not set
# BR2_PACKAGE_LIBRAW1394 is not set
-BR2_PACKAGE_TSLIB=y
+# BR2_PACKAGE_TSLIB is not set
# BR2_PACKAGE_LIBUSB is not set
#
@@ -628,9 +593,9 @@ BR2_PACKAGE_TSLIB=y
# BR2_PACKAGE_ICU is not set
# BR2_PACKAGE_LIBICONV is not set
BR2_PACKAGE_NCURSES=y
-BR2_PACKAGE_NCURSES_TARGET_PANEL=y
-BR2_PACKAGE_NCURSES_TARGET_FORM=y
-BR2_PACKAGE_NCURSES_TARGET_MENU=y
+# BR2_PACKAGE_NCURSES_TARGET_PANEL is not set
+# BR2_PACKAGE_NCURSES_TARGET_FORM is not set
+# BR2_PACKAGE_NCURSES_TARGET_MENU is not set
# BR2_PACKAGE_NEWT is not set
# BR2_PACKAGE_PCRE is not set
# BR2_PACKAGE_POPT is not set
@@ -669,7 +634,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_CUPS is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_ETHTOOL is not set
+BR2_PACKAGE_ETHTOOL=y
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_IFPLUGD is not set
# BR2_PACKAGE_IPERF is not set
@@ -771,7 +736,7 @@ BR2_TARGET_ROOTFS_JFFS2=y
# BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_512_16K is not set
BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K=y
-# BR2_TARGET_ROOTFS_JFFS2_FLASH_128 is not set
+BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y
# BR2_TARGET_ROOTFS_JFFS2_FLASH_64 is not set
# BR2_TARGET_ROOTFS_JFFS2_CUSTOM is not set
BR2_TARGET_ROOTFS_JFFS2_PAGESIZE=0x800
@@ -794,9 +759,6 @@ BR2_TARGET_ROOTFS_UBIFS_NONE=y
# BR2_TARGET_ROOTFS_UBIFS_GZIP is not set
# BR2_TARGET_ROOTFS_UBIFS_BZIP2 is not set
# BR2_TARGET_ROOTFS_UBIFS_LZMA is not set
-BR2_TARGET_ROOTFS_UBI=y
-BR2_TARGET_ROOTFS_UBI_PEBSIZE=0x20000
-BR2_TARGET_ROOTFS_UBI_SUBSIZE=512
# BR2_TARGET_ROOTFS_SQUASHFS is not set
BR2_TARGET_ROOTFS_TAR=y
BR2_TARGET_ROOTFS_TAR_NONE=y
@@ -813,8 +775,8 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
#
# BR2_TARGET_BAREBOX is not set
BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
+BR2_TARGET_UBOOT_BOARDNAME="apf27"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27-u-boot-$(BR2_TARGET_UBOOT_VERSION).h"
BR2_TARGET_UBOOT_1_3_4=y
# BR2_TARGET_UBOOT_2010_06 is not set
# BR2_TARGET_UBOOT_2010_03 is not set
@@ -826,7 +788,7 @@ BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR="target/u-boot/"
BR2_TARGET_UBOOT_FORMAT_BIN=y
# BR2_TARGET_UBOOT_FORMAT_KWB is not set
# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
-BR2_TARGET_UBOOT_TOOL_ENV=y
+# BR2_TARGET_UBOOT_TOOL_ENV is not set
BR2_TARGET_UBOOT_COPYTO=""
# BR2_TARGET_UBOOT_NETWORK is not set
# BR2_TARGET_AT91BOOTSTRAP is not set
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
new file mode 100644
index 0000000..24373c2
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/500-pps-armadeus-add_pps_baseboard.patch
@@ -0,0 +1,369 @@
+
+Adds support for APF27's PPS baseboard.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: linux-2.6.29.6/arch/arm/mach-mx2/pps.c
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ linux-2.6.29.6/arch/arm/mach-mx2/pps.c 2010-10-28 15:25:13.000000000 +0200
+@@ -0,0 +1,329 @@
++ /*
++ * pps.c
++ * Support of PPS baseboard
++ *
++ * Copyright (C) 2009 Armadeus Systems
++ * Authors: Julien Boibessot <jul...@ar...>
++ * Nicolas Colombain <nic...@ar...>
++ * Fabien Marteau <fab...@ar...>
++ *
++ * 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/spi/spi.h>
++#include <linux/i2c.h>
++#include <linux/serial.h>
++#include <linux/delay.h>
++#include <linux/irq.h>
++#include <linux/clk.h>
++#include <linux/dma-mapping.h>
++#include <asm/io.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-mx1-mx2.h>
++#include <mach/gpio.h>
++#include <mach/imx_i2c.h>
++#include <../mach-imx/include/mach/spi_imx.h>
++#include <mach/imx-uart.h>
++#include <mach/board-apf27.h>
++#include <asm/mach/map.h>
++#include <mach/mxc_nand.h>
++#include <mach/mxc_ehci.h>
++#include <mach/ulpi.h>
++#include <mach/mmc.h>
++
++#include "devices.h"
++#include "crm_regs.h"
++
++/*********/
++/* Wi2Wi */
++/*********/
++
++#define BT_RESETn (GPIO_PORTE | 11) /* UART3_RTS */
++#define WIFI_PWRDNn (GPIO_PORTE | 10) /* UART3_CTS */
++
++static int bt_wifi_pins[] = {
++ (BT_RESETn | GPIO_OUT | GPIO_GPIO),
++ (WIFI_PWRDNn | GPIO_OUT | GPIO_GPIO),
++};
++
++/* SDHC2 is used for WiFi */
++static int mxc_sdhc2_pins[] = {
++ PB4_PF_SDHC2_D0,
++ PB5_PF_SDHC2_D1,
++ PB6_PF_SDHC2_D2,
++ PB7_PF_SDHC2_D3,
++ PB8_PF_SDHC2_CMD,
++ PB9_PF_SDHC2_CLK,
++};
++
++static int sdhc2_init(struct device *dev, irq_handler_t handler, void *data)
++{
++ return mxc_gpio_setup_multiple_pins(mxc_sdhc2_pins,
++ ARRAY_SIZE(mxc_sdhc2_pins),
++ "SDHC2");
++}
++
++static void sdhc2_exit(struct device *pdev, void *data)
++{
++ mxc_gpio_release_multiple_pins(mxc_sdhc2_pins, ARRAY_SIZE(mxc_sdhc2_pins));
++}
++
++static struct imxmmc_platform_data sdhc2_pdata = {
++ .init = sdhc2_init,
++ .exit = sdhc2_exit,
++};
++
++static int bt_wifi_init(void)
++{
++ int res=0;
++
++ res = mxc_gpio_setup_multiple_pins(bt_wifi_pins,
++ ARRAY_SIZE(bt_wifi_pins), "BT_WIFI");
++ if(!res){
++ mxc_register_device(&mxc_sdhc_device1, &sdhc2_pdata);
++ gpio_set_value(WIFI_PWRDNn, 1); /* WiFi on */
++ gpio_set_value(BT_RESETn, 1); /* Bluetooth on */
++ }
++
++ mxc_gpio_release_multiple_pins(bt_wifi_pins, ARRAY_SIZE(bt_wifi_pins));
++
++ return res;
++}
++
++/***********/
++/* USBH1 */
++/***********/
++
++/* Adds an USB PHY ISP1105 on i.MX27 USB_HOST port 2 (pps schematic page 2) */
++static int mxc_usbh1_pins[] = {
++ PB22_PF_USBH1_SUSP,
++ PB23_PF_USB_PWR,
++ PB24_PF_USB_OC_B,
++ PB25_PF_USBH1_RCV,
++ PB26_PF_USBH1_FS,
++ PB27_PF_USBH1_OE_B,
++ PB28_PF_USBH1_TXDM,
++ PB29_PF_USBH1_TXDP,
++ PB30_PF_USBH1_RXDM,
++ PB31_PF_USBH1_RXDP
++};
++
++static int apf27_usbh1_init(struct platform_device *pdev)
++{
++ int ret;
++ uint32_t temp;
++
++ ret = mxc_gpio_setup_multiple_pins(mxc_usbh1_pins,
++ ARRAY_SIZE(mxc_usbh1_pins), "usbh1");
++ if (ret)
++ return ret;
++
++ temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
++ pr_debug("USB_CTRL before: 0x%08x\n", temp);
++ temp &= ~( (3 << 13) | (1 << 8) | 1 );
++ temp |= (1 << 4) | (1 << 11) ;
++ writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x600);
++ pr_debug("USB_CTRL after: 0x%08x\n", temp);
++
++ temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x384);
++ pr_debug("PORTSC1 before: 0x%08x\n", temp);
++ temp &= ~(3 << 30);
++ temp |= 3 << 30;
++ writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x384);
++ pr_debug("PORTSC1 after: 0x%08x\n", temp);
++ mdelay(10);
++
++ temp = readl(IO_ADDRESS(OTG_BASE_ADDR) + 0x340);
++ temp |= 0x02; /* reset controller */
++ writel(temp, IO_ADDRESS(OTG_BASE_ADDR) + 0x340);
++ pr_debug("reset controller: 0x%08x\n", temp);
++ mdelay(10);
++
++ return ret;
++}
++
++struct mxc_usb2_platform_data ehci1_pdata = {
++ .init = apf27_usbh1_init,
++};
++
++/***********/
++/* USBH2 */
++/***********/
++/* define USB registers XXX */
++#define USB_CTRL (IO_ADDRESS(OTG_BASE_ADDR) + 0x600)
++#define UOG_PORTSC1 (IO_ADDRESS(OTG_BASE_ADDR) + 0x184)
++#define UOG_USBCMD (IO_ADDRESS(OTG_BASE_ADDR) + 0x140)
++#define UOG_ULPIVIEW (IO_ADDRESS(OTG_BASE_ADDR) + 0x170)
++#define UH2_PORTSC1 (IO_ADDRESS(OTG_BASE_ADDR) + 0x584)
++#define UH2_USBCMD (IO_ADDRESS(OTG_BASE_ADDR) + 0x540)
++#define UH2_ULPIVIEW (IO_ADDRESS(OTG_BASE_ADDR) + 0x570)
++
++#define USBH2_RST_n_GPIO (GPIO_PORTB | 10)
++#define USBH2_RST_n (USBH2_RST_n_GPIO | GPIO_GPIO | GPIO_OUT)
++
++static int mxc_usbh2_reset_pin[] = {
++ USBH2_RST_n,
++};
++
++/* CONFIG EHCI2 USBH2 */
++static int mxc_usbh2_pins[] = {
++ PA0_PF_USBH2_CLK,
++ PA1_PF_USBH2_DIR,
++ PA3_PF_USBH2_NXT,
++ PA4_PF_USBH2_STP,
++ PD22_AF_USBH2_DATA0,
++ PD24_AF_USBH2_DATA1,
++ PD23_AF_USBH2_DATA2,
++ PD20_AF_USBH2_DATA3,
++ PD19_AF_USBH2_DATA4,
++ PD26_AF_USBH2_DATA5,
++ PD21_AF_USBH2_DATA6,
++ PA2_PF_USBH2_DATA7,
++
++};
++
++static int usb3315_set_vbus_power(void __iomem *view, int on)
++{
++ int vid, pid, ret = 0;
++
++ vid = (ulpi_read(USB3315_VID_HIGH, view) << 8) |
++ ulpi_read(USB3315_VID_LOW, view);
++ pid = (ulpi_read(USB3315_PID_HIGH, view) << 8) |
++ ulpi_read(USB3315_PID_LOW, view);
++
++ pr_info("ULPI h2 Vendor ID 0x%x Product ID 0x%x\n", vid, pid);
++ if (vid != 0x424 || pid != 0x6) { //XXX
++ pr_err("No USB3315 found\n");
++ return -1;
++ }
++
++ if (on) {
++ /* force disconnection of the DM/DP signals. This
++ avoid powering the connected device through these lines */
++ ulpi_set(RESET, USB3315_FCNCTL, view);
++ mdelay(10); /*wait until the supply is really down*/
++ ulpi_clear(RESET, USB3315_FCNCTL, view);
++ mdelay(1);
++
++ ret = ulpi_set(DRV_VBUS_EXT | /* enable external Vbus */
++ DRV_VBUS | /* enable internal Vbus */
++ USE_EXT_VBUS_IND | /* use external indicator */
++ CHRG_VBUS, /* charge Vbus */
++ USB3315_OTGCTL, view);
++ } else {
++ ret = ulpi_clear(DRV_VBUS_EXT | /* disable external Vbus */
++ DRV_VBUS, /* disable internal Vbus */
++ USB3315_OTGCTL, view);
++
++ ret |= ulpi_set(USE_EXT_VBUS_IND | /* use external indicator */
++ DISCHRG_VBUS, /* discharge Vbus */
++ USB3315_OTGCTL, view);
++ }
++
++ return ret;
++}
++
++static void usb3315_suspend(void __iomem *view)
++{
++ /* usb3315_set_vbus_power(view, 0); needed ? */
++ ulpi_clear(SUSPENDM, USB3315_FCNCTL, view);
++}
++
++static int apf27_usbh2_init(struct platform_device *pdev)
++{
++ int ret;
++ uint32_t temp;
++
++ gpio_set_value(USBH2_RST_n_GPIO, 1); /* reset off */
++
++ ret = mxc_gpio_setup_multiple_pins(mxc_usbh2_reset_pin,
++ ARRAY_SIZE(mxc_usbh2_reset_pin), "USBH2_RESET");
++
++ ret = mxc_gpio_setup_multiple_pins(mxc_usbh2_pins,
++ ARRAY_SIZE(mxc_usbh2_pins), "USBH2");
++ if (ret)
++ return ret;
++
++ temp = readl(USB_CTRL);
++
++ pr_debug("USB_CTRL before: 0x%08x\n", temp);
++ /* H2SIC = 3 */
++ temp &= ~( (3 << 21) | 1 );
++ /* H2PM=1, H2WIE=1, H2UIE=1 */
++ temp |= (1 << 16) | (1 << 19) | (1 << 20);
++ writel(temp, USB_CTRL);
++ pr_debug("USB_CTRL after: 0x%08x\n", temp);
++
++ temp = readl(UH2_PORTSC1);
++ pr_debug("PORTSC1 before: 0x%08x\n", temp);
++ /* XXX: ? */
++ temp &= ~(3 << 30);
++ temp |= 2 << 30;
++ writel(temp, UH2_PORTSC1);
++ pr_debug("PORTSC1 after: 0x%08x\n", temp);
++
++ mdelay(10);
++
++ temp = readl(UH2_USBCMD);
++ temp |= 0x02; /* reset controller */
++ writel(temp, UH2_USBCMD);
++ pr_debug("reset controller: 0x%08x\n", temp);
++ mdelay(50);
++
++ if (ret)
++ mxc_gpio_release_multiple_pins(mxc_usbh2_pins,
++ ARRAY_SIZE(mxc_usbh2_pins));
++
++ ret = usb3315_set_vbus_power(
++ (void __iomem *)UH2_ULPIVIEW, 1);
++
++ return ret;
++}
++
++struct mxc_usb2_platform_data ehci2_pdata = {
++ .init = apf27_usbh2_init,
++};
++
++/******************/
++/* Baseboard init */
++/******************/
++void apf27_baseboard_resume(void)
++{
++ /* TO BE DONE */
++}
++
++void apf27_baseboard_suspend(void)
++{
++ /* TO BE DONE */
++}
++
++void __init apf27_baseboard_init(void)
++{
++ printk("\n** Registering PPS ressources: **\n");
++
++ /* Init USB */
++ mxc_register_device(&mxc_ehci1, &ehci1_pdata);
++ mxc_register_device(&mxc_ehci2, &ehci2_pdata);
++
++ /* init Wi2Wi */
++ bt_wifi_init();
++
++ printk("done\n");
++}
++
+Index: linux-2.6.29.6/arch/arm/mach-mx2/Kconfig
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Kconfig 2010-10-28 15:15:50.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/Kconfig 2010-10-28 15:15:53.000000000 +0200
+@@ -63,6 +63,13 @@
+ activates the devices you want to use if you have the "Full"
+ version.
+
++config MACH_PPS
++ prompt "Md PPS"
++ bool
++ depends on MACH_APF27
++ help
++ This selects the PPS as baseboard.
++
+ endchoice
+
+ config MACH_APF27_DEV_EXT
+Index: linux-2.6.29.6/arch/arm/mach-mx2/Makefile
+===================================================================
+--- linux-2.6.29.6.orig/arch/arm/mach-mx2/Makefile 2010-10-28 15:15:51.000000000 +0200
++++ linux-2.6.29.6/arch/arm/mach-mx2/Makefile 2010-10-28 15:15:53.000000000 +0200
+@@ -15,6 +15,7 @@
+ obj-$(CONFIG_MACH_APF27_DEV) += apf27-dev.o
+ obj-$(CONFIG_MACH_APF27_DEV) += apf27-lcd.o
+ obj-$(CONFIG_MACH_APF27_DEV_EXT_WIRELESS) += apf27-dev-ext-apw.o
++obj-$(CONFIG_MACH_PPS) += pps.o
+ obj-$(CONFIG_MACH_MX27ADS) += mx27ads.o
+ obj-$(CONFIG_MACH_PCM038) += pcm038.o
+ obj-$(CONFIG_MACH_PCM970_BASEBOARD) += pcm970-baseboard.o
diff --git a/buildroot/target/device/armadeus/apf27/Config.in b/buildroot/target/device/armadeus/pps/Config.in
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/Config.in
copy to buildroot/target/device/armadeus/pps/Config.in
diff --git a/buildroot/target/device/armadeus/apf27/Makefile.in b/buildroot/target/device/armadeus/pps/Makefile.in
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/Makefile.in
copy to buildroot/target/device/armadeus/pps/Makefile.in
diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf27/apf27.h
copy to buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
index 816d3e1..ef2d8bf 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/pps/apf27-u-boot-1.3.4.h
@@ -110,13 +110,13 @@
/*
* Boot options. Setting delay to -1 stops autostart count down.
*/
-#define CONFIG_BOOTDELAY 20
+#define CONFIG_BOOTDELAY 1
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)
+#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)" otg_mode=device"
#define CONFIG_MTDMAP "mxc_nand.0"
#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":640k(U-boot)ro," \
@@ -223,7 +223,7 @@
#define CONFIG_ETHADDR
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_IPADDR 192.168.0.10
-#define CONFIG_BOARD_NAME "apf27"
+#define CONFIG_BOARD_NAME "pps"
#define CONFIG_HOSTNAME "apf27"
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.2
@@ -762,7 +762,7 @@
#define CFG_ICFB1_E_VAL 0xFFFFFFFF
#define CFG_ICFB2_E_VAL 0xFFFFFFFF
#define CFG_DR_E_VAL 0x00000000
-#define CFG_GIUS_E_VAL 0xFCFFCCF8
+#define CFG_GIUS_E_VAL 0xFFFFCCF8
#define CFG_ICR1_E_VAL 0x00000000
#define CFG_ICR2_E_VAL 0x00000000
#define CFG_IMR_E_VAL 0x00000000
@@ -912,4 +912,3 @@
#define CFG_SDRAM_PRECHARGE_ALL_VAL (1<<10)
#endif /* __CONFIG_H */
-
diff --git a/buildroot/target/device/armadeus/apf27/apf27.h b/buildroot/target/device/armadeus/pps/apf27.h
similarity index 99%
copy from buildroot/target/device/armadeus/apf27/apf27.h
copy to buildroot/target/device/armadeus/pps/apf27.h
index 816d3e1..ef2d8bf 100644
--- a/buildroot/target/device/armadeus/apf27/apf27.h
+++ b/buildroot/target/device/armadeus/pps/apf27.h
@@ -110,13 +110,13 @@
/*
* Boot options. Setting delay to -1 stops autostart count down.
*/
-#define CONFIG_BOOTDELAY 20
+#define CONFIG_BOOTDELAY 1
#define CONFIG_ZERO_BOOTDELAY_CHECK
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
-#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)
+#define CONFIG_CONSOLE "console=ttySMX0,"MK_STR(CONFIG_BAUDRATE)" otg_mode=device"
#define CONFIG_MTDMAP "mxc_nand.0"
#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":640k(U-boot)ro," \
@@ -223,7 +223,7 @@
#define CONFIG_ETHADDR
#define CONFIG_NETMASK 255.255.255.0
#define CONFIG_IPADDR 192.168.0.10
-#define CONFIG_BOARD_NAME "apf27"
+#define CONFIG_BOARD_NAME "pps"
#define CONFIG_HOSTNAME "apf27"
#define CONFIG_GATEWAYIP 192.168.0.1
#define CONFIG_SERVERIP 192.168.0.2
@@ -762,7 +762,7 @@
#define CFG_ICFB1_E_VAL 0xFFFFFFFF
#define CFG_ICFB2_E_VAL 0xFFFFFFFF
#define CFG_DR_E_VAL 0x00000000
-#define CFG_GIUS_E_VAL 0xFCFFCCF8
+#define CFG_GIUS_E_VAL 0xFFFFCCF8
#define CFG_ICR1_E_VAL 0x00000000
#define CFG_ICR2_E_VAL 0x00000000
#define CFG_IMR_E_VAL 0x00000000
@@ -912,4 +912,3 @@
#define CFG_SDRAM_PRECHARGE_ALL_VAL (1<<10)
#endif /* __CONFIG_H */
-
diff --git a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
similarity index 86%
copy from buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
copy to buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
index 13f114c..48401b4 100644
--- a/buildroot/target/device/armadeus/apf27/apf27-linux-2.6.29.config
+++ b/buildroot/target/device/armadeus/pps/pps-linux-2.6.29.config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.6
-# Thu Sep 9 16:05:02 2010
+# Thu Oct 28 15:55:41 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -190,9 +190,8 @@ CONFIG_MACH_APF27_FPGA=y
# CONFIG_MACH_MX27ADS is not set
# CONFIG_MACH_PCM038 is not set
# CONFIG_MACH_PCM970_BASEBOARD is not set
-CONFIG_MACH_APF27_DEV=y
-CONFIG_MACH_APF27_DEV_EXT_NONE=y
-# CONFIG_MACH_APF27_DEV_EXT_WIRELESS is not set
+# CONFIG_MACH_APF27_DEV is not set
+CONFIG_MACH_PPS=y
# CONFIG_MXC_IRQ_PRIOR is not set
CONFIG_MXC_ULPI=y
@@ -309,8 +308,6 @@ CONFIG_SUSPEND=y
# CONFIG_PM_TEST_SUSPEND is not set
CONFIG_SUSPEND_FREEZER=y
# CONFIG_APM_EMULATION is not set
-# CONFIG_USE_APF27DEV_IMX_LED_FOR_PM is not set
-# CONFIG_USE_APF27DEV_IMX_SWITCH_FOR_PM is not set
CONFIG_ARCH_SUSPEND_POSSIBLE=y
CONFIG_NET=y
@@ -400,29 +397,7 @@ CONFIG_IPV6_NDISC_NODETYPE=y
# CONFIG_HAMRADIO is not set
# CONFIG_CAN is not set
# CONFIG_IRDA is not set
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-# CONFIG_BT_HCIBTSDIO is not set
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-# CONFIG_BT_HCIUART_LL is not set
-# CONFIG_BT_HCIBCM203X is not set
-# CONFIG_BT_HCIBPA10X is not set
-# CONFIG_BT_HCIBFUSB is not set
-# CONFIG_BT_HCIVHCI is not set
+# CONFIG_BT is not set
# CONFIG_AF_RXRPC is not set
# CONFIG_PHONET is not set
CONFIG_WIRELESS=y
@@ -639,7 +614,7 @@ CONFIG_NETDEVICES=y
# CONFIG_VETH is not set
# CONFIG_PHYLIB is not set
CONFIG_NET_ETHERNET=y
-# CONFIG_MII is not set
+CONFIG_MII=y
# CONFIG_AX88796 is not set
# CONFIG_SMC91X is not set
# CONFIG_DM9000 is not set
@@ -667,7 +642,7 @@ CONFIG_WLAN_80211=y
CONFIG_LIBERTAS=m
# CONFIG_LIBERTAS_USB is not set
CONFIG_LIBERTAS_SDIO=m
-# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_DEBUG=y
# CONFIG_LIBERTAS_THINFIRM is not set
# CONFIG_USB_ZD1201 is not set
# CONFIG_USB_NET_RNDIS_WLAN is not set
@@ -700,7 +675,24 @@ CONFIG_RT2X00_LIB_CRYPTO=y
# CONFIG_USB_KAWETH is not set
# CONFIG_USB_PEGASUS is not set
# CONFIG_USB_RTL8150 is not set
-# CONFIG_USB_USBNET is not set
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_CDCETHER=m
+# CONFIG_USB_NET_DM9601 is not set
+CONFIG_USB_NET_SMSC95XX=m
+# CONFIG_USB_NET_GL620A is not set
+CONFIG_USB_NET_NET1080=m
+# CONFIG_USB_NET_PLUSB is not set
+# CONFIG_USB_NET_MCS7830 is not set
+# CONFIG_USB_NET_RNDIS_HOST is not set
+CONFIG_USB_NET_CDC_SUBSET=m
+# CONFIG_USB_ALI_M5632 is not set
+# CONFIG_USB_AN2720 is not set
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+# CONFIG_USB_KC2190 is not set
+CONFIG_USB_NET_ZAURUS=m
# CONFIG_WAN is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
@@ -719,57 +711,19 @@ CONFIG_INPUT=y
#
# Userland interfaces
#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=y
-CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_EVDEV is not set
# CONFIG_INPUT_EVBUG is not set
#
# Input Device Drivers
#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_KEYBOARD_MXC=m
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_GPIO is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=y
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-# CONFIG_MOUSE_PS2_ELANTECH is not set
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-# CONFIG_MOUSE_SERIAL is not set
-# CONFIG_MOUSE_APPLETOUCH is not set
-# CONFIG_MOUSE_BCM5974 is not set
-# CONFIG_MOUSE_VSXXXAA is not set
-# CONFIG_MOUSE_GPIO is not set
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
# CONFIG_INPUT_JOYSTICK is not set
# CONFIG_INPUT_TABLET is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_TOUCHSCREEN_ADS7846 is not set
-# CONFIG_TOUCHSCREEN_FUJITSU is not set
-# CONFIG_TOUCHSCREEN_GUNZE is not set
-# CONFIG_TOUCHSCREEN_ELO is not set
-# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set
-# CONFIG_TOUCHSCREEN_MTOUCH is not set
-# CONFIG_TOUCHSCREEN_INEXIO is not set
-# CONFIG_TOUCHSCREEN_MK712 is not set
-# CONFIG_TOUCHSCREEN_PENMOUNT is not set
-# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set
-# CONFIG_TOUCHSCREEN_TOUCHWIN is not set
-CONFIG_TOUCHSCREEN_TSC2102=m
-# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set
-# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set
-# CONFIG_TOUCHSCREEN_TSC2007 is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
CONFIG_INPUT_MISC=y
# CONFIG_INPUT_ATI_REMOTE is not set
# CONFIG_INPUT_ATI_REMOTE2 is not set
@@ -810,9 +764,11 @@ CONFIG_DEVKMEM=y
CONFIG_SERIAL_IMX=y
CONFIG_SERIAL_IMX_CONSOLE=y
CONFIG_SERIAL_IMX_UART1=y
+# CONFIG_SERIAL_IMX_UART1_USE_RTSCTS is not set
# CONFIG_SERIAL_IMX_UART2 is not set
CONFIG_SERIAL_IMX_UART3=y
# CONFIG_SERIAL_IMX_UART3_USE_RTSCTS is not set
+# CONFIG_SERIAL_IMX_UART4 is not set
# CONFIG_SERIAL_IMX_UART5 is not set
# CONFIG_SERIAL_IMX_UART6 is not set
CONFIG_SERIAL_CORE=y
@@ -1049,7 +1005,6 @@ CONFIG_MEDIA_TUNER_CUSTOMIZE=y
# CONFIG_MEDIA_TUNER_MXL5007T is not set
CONFIG_VIDEO_V4L2=m
CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_VMALLOC=m
CONFIG_VIDEOBUF_DMA_CONTIG=m
CONFIG_VIDEO_CAPTURE_DRIVERS=y
# CONFIG_VIDEO_ADV_DEBUG is not set
@@ -1109,7 +1064,7 @@ CONFIG_VIDEO_AD9889=m
#
# CONFIG_VIDEO_UPD64031A is not set
# CONFIG_VIDEO_UPD64083 is not set
-CONFIG_VIDEO_VIVI=m
+# CONFIG_VIDEO_VIVI is not set
# CONFIG_VIDEO_SAA5246A is not set
# CONFIG_VIDEO_SAA5249 is not set
CONFIG_SOC_CAMERA=m
@@ -1120,9 +1075,9 @@ CONFIG_SOC_CAMERA=m
# CONFIG_SOC_CAMERA_TW9910 is not set
# CONFIG_SOC_CAMERA_PLATFORM is not set
# CONFIG_SOC_CAMERA_OV3640 is not set
-CONFIG_SOC_CAMERA_OV7670=m
+# CONFIG_SOC_CAMERA_OV7670 is not set
# CONFIG_SOC_CAMERA_OV772X is not set
-CONFIG_SOC_CAMERA_OV96XX=m
+# CONFIG_SOC_CAMERA_OV96XX is not set
# CONFIG_V4L_USB_DRIVERS is not set
CONFIG_VIDEO_MX27=m
# CONFIG_RADIO_ADAPTERS is not set
@@ -1133,58 +1088,8 @@ CONFIG_VIDEO_MX27=m
#
# CONFIG_VGASTATE is not set
# CONFIG_VIDEO_OUTPUT_CONTROL is not set
-CONFIG_FB=y
-# CONFIG_FIRMWARE_EDID is not set
-# CONFIG_FB_DDC is not set
-# CONFIG_FB_BOOT_VESA_SUPPORT is not set
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-# CONFIG_FB_SYS_FILLRECT is not set
-# CONFIG_FB_SYS_COPYAREA is not set
-# CONFIG_FB_SYS_IMAGEBLIT is not set
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-# CONFIG_FB_SYS_FOPS is not set
-# CONFIG_FB_SVGALIB is not set
-# CONFIG_FB_MACMODES is not set
-# CONFIG_FB_BACKLIGHT is not set
-# CONFIG_FB_MODE_HELPERS is not set
-# CONFIG_FB_TILEBLITTING is not set
-
-#
-# Frame buffer hardware drivers
-#
-# CONFIG_FB_IMX is not set
-# CONFIG_FB_IMX_CHIMEI_LW700AT9003_TFT is not set
-# CONFIG_FB_IMX_HITACHI_TX12D17VM1BDP_TFT is not set
-# CONFIG_FB_IMX_MICROTIPS_MTF_T035_TFT is not set
-# CONFIG_FB_IMX_MOTOROLA_A910_TFT is not set
-# CONFIG_FB_IMX_OPTREX_F51900_CSTN is not set
-# CONFIG_FB_IMX_OPTREX_T51638D084_TFT is not set
-CONFIG_FB_IMX_SHARP_LQ043_TFT=y
-# CONFIG_FB_IMX_SHARP_LQ057_TFT is not set
-# CONFIG_FB_IMX_CUSTOM_LCD is not set
-CONFIG_FB_MXC=y
-
-#
-# MXC framebuffer options
-#
-CONFIG_FB_MXC_SYNC_PANEL=y
-# CONFIG_FB_MXC_OVERLAY is not set
-# CONFIG_FB_S1D13XXX is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-# CONFIG_LCD_LTV350QV is not set
-# CONFIG_LCD_ILI9320 is not set
-# CONFIG_LCD_TDO24M is not set
-# CONFIG_LCD_VGG2432A4 is not set
-# CONFIG_LCD_PLATFORM is not set
-CONFIG_BACKLIGHT_CLASS_DEVICE=m
-CONFIG_BACKLIGHT_GENERIC=m
+# CONFIG_FB is not set
+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set
#
# Display device support
@@ -1196,25 +1101,6 @@ CONFIG_BACKLIGHT_GENERIC=m
#
# CONFIG_VGA_CONSOLE is not set
CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-# CONFIG_FONT_8x16 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-# CONFIG_LOGO_LINUX_MONO is not set
-# CONFIG_LOGO_LINUX_VGA16 is not set
-CONFIG_LOGO_LINUX_CLUT224=y
-# CONFIG_LOGO_ARMADEUS_CLUT224 is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SND=m
@@ -1245,43 +1131,7 @@ CONFIG_SND_USB=y
# CONFIG_SND_USB_CAIAQ is not set
# CONFIG_SND_SOC is not set
# CONFIG_SOUND_PRIME is not set
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=y
-# CONFIG_HID_DEBUG is not set
-# CONFIG_HIDRAW is not set
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=y
-# CONFIG_HID_PID is not set
-# CONFIG_USB_HIDDEV is not set
-
-#
-# Special HID drivers
-#
-CONFIG_HID_COMPAT=y
-# CONFIG_HID_A4TECH is not set
-# CONFIG_HID_APPLE is not set
-# CONFIG_HID_BELKIN is not set
-# CONFIG_HID_CHERRY is not set
-# CONFIG_HID_CHICONY is not set
-# CONFIG_HID_CYPRESS is not set
-# CONFIG_HID_EZKEY is not set
-# CONFIG_HID_GYRATION is not set
-# CONFIG_HID_LOGITECH is not set
-# CONFIG_HID_MICROSOFT is not set
-# CONFIG_HID_MONTEREY is not set
-# CONFIG_HID_NTRIG is not set
-# CONFIG_HID_PANTHERLORD is not set
-# CONFIG_HID_PETALYNX is not set
-# CONFIG_HID_SAMSUNG is not set
-# CONFIG_HID_SONY is not set
-# CONFIG_HID_SUNPLUS is not set
-# CONFIG_GREENASIA_FF is not set
-# CONFIG_HID_TOPSEED is not set
-# CONFIG_THRUSTMASTER_FF is not set
-# CONFIG_ZEROPLUS_FF is not set
+# CONFIG_HID_SUPPORT is not set
CONFIG_USB_SUPPORT=y
CONFIG_USB_ARCH_HAS_HCD=y
# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -1385,15 +1235,15 @@ CONFIG_USB_STORAGE=y
# CONFIG_USB_TEST is not set
# CONFIG_USB_ISIGHTFW is not set
# CONFIG_USB_VST is not set
-CONFIG_USB_GADGET=y
-CONFIG_USB_GADGET_DEBUG_FILES=y
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
# CONFIG_USB_GADGET_DEBUG_FS is not set
CONFIG_USB_GADGET_VBUS_DRAW=2
CONFIG_USB_GADGET_SELECTED=y
# CONFIG_USB_GADGET_AT91 is not set
# CONFIG_USB_GADGET_ATMEL_USBA is not set
CONFIG_USB_GADGET_FSL_USB2=y
-CONFIG_USB_FSL_USB2=y
+CONFIG_USB_FSL_USB2=m
# CONFIG_USB_GADGET_LH7A40X is not set
# CONFIG_USB_GADGET_OMAP is not set
# CONFIG_USB_GADGET_PXA25X is not set
@@ -1411,9 +1261,9 @@ CONFIG_USB_GADGET_DUALSPEED=y
# CONFIG_USB_ZERO is not set
CONFIG_USB_ETH=m
CONFIG_USB_ETH_RNDIS=y
-CONFIG_USB_GADGETFS=m
+# CONFIG_USB_GADGETFS is not set
# CONFIG_USB_FILE_STORAGE is not set
-CONFIG_USB_G_SERIAL=m
+# CONFIG_USB_G_SERIAL is not set
# CONFIG_USB_MIDI_GADGET is not set
# CONFIG_USB_G_PRINTER is not set
# CONFIG_USB_CDC_COMPOSITE is not set
@@ -1435,7 +1285,7 @@ CONFIG_ARMADEUS_DRIVERS=y
# CONFIG_ARMADEUS_AS1531_PLAT is not set
CONFIG_ARMADEUS_GPIO_DRIVER=m
# CONFIG_ARMADEUS_KEYPAD_DRIVER is not set
-CONFIG_ARMADEUS_MAX1027=m
+# CONFIG_ARMADEUS_MAX1027 is not set
# CONFIG_ARMADEUS_MAX9768 is not set
#
@@ -1464,21 +1314,20 @@ CONFIG_ARMADEUS_FPGA_LOADER_DRIVER=m
# Handheld related
#
CONFIG_ARMADEUS_PWM_DRIVER=m
-CONFIG_IMX_BACKLIGHT=m
# CONFIG_HX5116_DISPLAY is not set
#
# Communication bus related
#
# CONFIG_ARMADEUS_ISP1761 is not set
-CONFIG_MMC=y
+CONFIG_MMC=m
# CONFIG_MMC_DEBUG is not set
# CONFIG_MMC_UNSAFE_RESUME is not set
#
# MMC/SD/SDIO Card Drivers
#
-CONFIG_MMC_BLOCK=y
+CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_BOUNCE=y
# CONFIG_SDIO_UART is not set
# CONFIG_MMC_TEST is not set
@@ -1487,7 +1336,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
# MMC/SD/SDIO Host Controller Drivers
#
# CONFIG_MMC_SDHCI is not set
-CONFIG_MMC_MXC=y
+CONFIG_MMC_MXC=m
# CONFIG_MMC_SPI is not set
# CONFIG_MEMSTICK is not set
# CONFIG_ACCESSIBILITY is not set
@@ -1563,8 +1412,7 @@ CONFIG_RTC_DRV_DS1374=y
#
# MXC VPU(Video Processing Unit) support
#
-CONFIG_MXC_VPU=y
-CONFIG_MXC_VPU_DEBUG=y
+# CONFIG_MXC_VPU is not set
# CONFIG_REGULATOR is not set
# CONFIG_UIO is not set
# CONFIG_STAGING is not set
@@ -1638,21 +1486,7 @@ CONFIG_MISC_FILESYSTEMS=y
# CONFIG_BEFS_FS is not set
# CONFIG_BFS_FS is not set
# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-CONFIG_JFFS2_COMPRESSION_OPTIONS=y
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_LZO=y
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_JFFS2_CMODE_NONE=y
-# CONFIG_JFFS2_CMODE_PRIORITY is not set
-# CONFIG_JFFS2_CMODE_SIZE is not set
-# CONFIG_JFFS2_CMODE_FAVOURLZO is not set
+# CONFIG_JFFS2_FS is not set
CONFIG_UBIFS_FS=y
# CONFIG_UBIFS_FS_XATTR is not set
# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/pps/pps_defconfig
similarity index 95%
copy from buildroot/target/device/armadeus/apf27/apf27_defconfig
copy to buildroot/target/device/armadeus/pps/pps_defconfig
index de1763b..5d6dd9f 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/pps/pps_defconfig
@@ -1,7 +1,6 @@
#
# Automatically generated make config: don't edit
-# Thu Sep 9 16:01:40 2010
-#
+# Tue Oct 26 15:33:44 2010
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
# BR2_alpha is not set
@@ -59,7 +58,7 @@ BR2_GCC_TARGET_ABI="aapcs-linux"
#
# Project Options
#
-BR2_PROJECT="apf27"
+BR2_PROJECT="pps"
BR2_HOSTNAME="armadeus"
BR2_BANNER="Welcome to the Armadeus development environment."
@@ -69,7 +68,8 @@ BR2_BANNER="Welcome to the Armadeus development environment."
BR2_TARGET_ARMADEUS=y
# BR2_TARGET_ARMADEUS_APF9328 is not set
BR2_TARGET_ARMADEUS_APF27=y
-BR2_BOARD_NAME="apf27"
+# BR2_TARGET_ARMADEUS_APF51 is not set
+BR2_BOARD_NAME="pps"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx27"
# BR2_TARGET_ARMADEUS_APF27_SDRAM_16 is not set
@@ -391,7 +391,7 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_ARGUS is not set
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
-# BR2_PACKAGE_BOA is not set
+BR2_PACKAGE_BOA=y
# BR2_PACKAGE_BIND is not set
# BR2_PACKAGE_BLUEZ_LIBS is not set
@@ -401,7 +401,7 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
-# BR2_PACKAGE_ETHTOOL is not set
+BR2_PACKAGE_ETHTOOL=y
# BR2_PACKAGE_HASERL is not set
# BR2_PACKAGE_IFPLUGD is not set
# BR2_PACKAGE_IRDA_UTILS is not set
@@ -443,7 +443,9 @@ BR2_PACKAGE_NTP=y
# BR2_PACKAGE_OPENNTPD is not set
# BR2_PACKAGE_OPENOBEX is not set
# BR2_PACKAGE_OPENSSH is not set
-# BR2_PACKAGE_OPENSSL is not set
+BR2_PACKAGE_OPENSSL=y
+BR2_PACKAGE_OPENSSL_BIN=y
+# BR2_PACKAGE_OPENSSL_ENGINES is not set
# BR2_PACKAGE_OPENVPN is not set
# BR2_PACKAGE_OPENSWAN is not set
BR2_PACKAGE_PORTMAP=y
@@ -481,7 +483,11 @@ BR2_PACKAGE_PORTMAP=y
# BR2_PACKAGE_VTUN is not set
# BR2_PACKAGE_WEBIF is not set
BR2_PACKAGE_WIRELESS_TOOLS=y
-# BR2_PACKAGE_WPA_SUPPLICANT is not set
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_OPENSSL=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_CWIID is not set
@@ -494,7 +500,24 @@ BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_E2FSPROGS is not set
# BR2_PACKAGE_EEPROG is not set
# BR2_PACKAGE_FCONFIG is not set
-# BR2_PACKAGE_FIRMWARE is not set
+BR2_PACKAGE_FIRMWARE=y
+
+#
+# Video
+#
+
+#
+# WiFi chipsets
+#
+BR2_PACKAGE_FIRMWARE_88W8686=y
+BR2_PACKAGE_FIRMWARE_88W8686_SDIO=y
+# BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V8 is not set
+BR2_PACKAGE_FIRMWARE_88W8686_SDIO_V9=y
+# BR2_PACKAGE_FIRMWARE_88W8686_GSPI is not set
+
+#
+# Others
+#
# BR2_PACKAGE_FIS is not set
# BR2_PACKAGE_LIBFUSE is not set
# BR2_PACKAGE_GADGETFS_TEST is not set
@@ -504,8 +527,9 @@ BR2_BLOCKDEV_SUPPORT=y
# BR2_PACKAGE_HWDATA is not set
BR2_PACKAGE_I2C_TOOLS=y
# BR2_PACKAGE_INPUT_TOOLS is not set
-# BR2_PACKAGE_PICKIT2 is not set
# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_PICKIT2 is not set
+# BR2_PACKAGE_JOYSTICKTEST is not set
# BR2_PACKAGE_LCD4LINUX is not set
# BR2_PACKAGE_LIBAIO is not set
# BR2_PACKAGE_LIBRAW1394 is not set
@@ -564,26 +588,7 @@ BR2_PACKAGE_MTD_UBIUPDATEVOL=y
# BR2_PACKAGE_XENOMAI is not set
# BR2_PACKAGE_XFSPROGS is not set
BR2_AUDIO_SUPPORT=y
-BR2_PACKAGE_ALSA_LIB=y
-BR2_PACKAGE_ALSA_UTILS=y
-
-#
-# ALSA utils selection
-#
-# BR2_PACKAGE_ALSA_UTILS_ALSACONF is not set
-BR2_PACKAGE_ALSA_UTILS_ALSACTL=y
-BR2_PACKAGE_ALSA_UTILS_ALSAMIXER=y
-# BR2_PACKAGE_ALSA_UTILS_AMIDI is not set
-BR2_PACKAGE_ALSA_UTILS_AMIXER=y
-BR2_PACKAGE_ALSA_UTILS_APLAY=y
-BR2_PACKAGE_ALSA_UTILS_ARECORD=y
-# BR2_PACKAGE_ALSA_UTILS_IECSET is not set
-# BR2_PACKAGE_ALSA_UTILS_ACONNECT is not set
-# BR2_PACKAGE_ALSA_UTILS_APLAYMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQDUMP is not set
-# BR2_PACKAGE_ALSA_UTILS_ASEQNET is not set
-BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
+# BR2_PACKAGE_ALSA_LIB is not set
#
# asterisk - disabled (required openssl and mpg123)
@@ -599,7 +604,6 @@ BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST=y
#
# BR2_PACKAGE_MADPLAY is not set
# BR2_PACKAGE_MPG123 is not set
-BR2_PACKAGE_MPG123_ALSA=y
# BR2_PACKAGE_SPEEX is not set
# BR2_PACKAGE_FESTIVAL is not set
# BR2_PACKAGE_FLITE is not set
@@ -660,6 +664,10 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_QT is not set
#
+# Qwt requires Qt to be installed
+#
+
+#
# X Window System server
#
BR2_PACKAGE_XSERVER_none=y
@@ -729,7 +737,6 @@ BR2_PACKAGE_ZLIB=y
# BR2_XML_SUPPORT is not set
# BR2_JAVA_SUPPORT is not set
# BR2_GAMES is not set
-# BR2_PACKAGE_JOYSTICKTEST is not set
#
# Target filesystem options
@@ -791,8 +798,8 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
# bootloader for target device
#
BR2_TARGET_UBOOT=y
-BR2_TARGET_UBOOT_BOARDNAME="$(BR2_BOARD_NAME)"
-BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME).h"
+BR2_TARGET_UBOOT_BOARDNAME="apf27"
+BR2_TARGET_U_BOOT_CONFIG_HEADER_FILE="$(BR2_BOARD_PATH)/apf27.h"
BR2_TARGET_UBOOT_CUSTOM_PATCH=""
BR2_TARGET_UBOOT_SERVERIP=""
BR2_TARGET_UBOOT_IPADDR=""
diff --git a/buildroot/target/device/armadeus/apf51/uClibc-0.9.30.config.arm b/buildroot/target/device/armadeus/pps/uClibc-0.9.30.config.arm
similarity index 98%
copy from buildroot/target/device/armadeus/apf51/uClibc-0.9.30.config.arm
copy to buildroot/target/device/armadeus/pps/uClibc-0.9.30.config.arm
index 0ef197a..88985ed 100644
--- a/buildroot/target/device/armadeus/apf51/uClibc-0.9.30.config.arm
+++ b/buildroot/target/device/armadeus/pps/uClibc-0.9.30.config.arm
@@ -1,7 +1,6 @@
#
# Automatically generated make config: don't edit
-# Version: 0.9.30.2
-# Mon Feb 1 14:24:52 2010
+# Mon Nov 3 21:39:03 2008
#
# TARGET_alpha is not set
TARGET_arm=y
@@ -93,7 +92,7 @@ UCLIBC_CTOR_DTOR=y
# LDSO_GNU_HASH_SUPPORT is not set
# HAS_NO_THREADS is not set
UCLIBC_HAS_THREADS=y
-# PTHREADS_DEBUG_SUPPORT is not set
+PTHREADS_DEBUG_SUPPORT=y
LINUXTHREADS_OLD=y
UCLIBC_HAS_SYSLOG=y
UCLIBC_HAS_LFS=y
diff --git a/buildroot/target/device/armadeus/apf27/uClibc.config.arm b/buildroot/target/device/armadeus/pps/uClibc.config.arm
similarity index 100%
copy from buildroot/target/device/armadeus/apf27/uClibc.config.arm
copy to buildroot/target/device/armadeus/pps/uClibc.config.arm
hooks/post-receive
--
armadeus
|
