[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-73-gd0cbf4c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-73-gd0cbf4c
|
From: Nicolas <th...@us...> - 2011-04-21 09:31:46
|
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 d0cbf4c657ddf54f86704178a6311c8e31efd8d4 (commit)
from d2486b3cf1804c035d90f5c3d505e591f4c19ddc (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 d0cbf4c657ddf54f86704178a6311c8e31efd8d4
Author: Nicolas Colombain <nic...@ar...>
Date: Thu Apr 21 11:31:16 2011 +0200
[U-BOOT] APF51 update for series boards
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf51_defconfig | 8 ++--
.../device/armadeus/apf51/apf51-u-boot-2010.03.h | 15 +++++-
.../target/u-boot/u-boot-2010.03-401-apf51.patch | 58 +++++++++++++++++---
3 files changed, 67 insertions(+), 14 deletions(-)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 462c1fc..a5f6101 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -59,7 +59,7 @@ BR2_BOARD_NAME="apf51"
BR2_BOARD_PATH="target/device/armadeus/$(BR2_BOARD_NAME)"
BR2_CPU_NAME="imx51"
BR2_TARGET_ARMADEUS_NR_SDRAM="1"
-BR2_TARGET_ARMADEUS_SDRAM_SIZE="128"
+BR2_TARGET_ARMADEUS_SDRAM_SIZE="256"
# BR2_TARGET_ARMLTD is not set
# BR2_TARGET_ATMEL is not set
# BR2_TARGET_KWIKBYTE is not set
@@ -80,9 +80,9 @@ BR2_TARGET_GENERIC_GETTY=y
# BR2_TARGET_GENERIC_GETTY_TTYSAC2 is not set
# BR2_TARGET_GENERIC_GETTY_TTYSAC3 is not set
# BR2_TARGET_GENERIC_GETTY_TTYMXC0 is not set
-BR2_TARGET_GENERIC_GETTY_TTYMXC1=y
-# BR2_TARGET_GENERIC_GETTY_TTYMXC2 is not set
-BR2_TARGET_GENERIC_GETTY_PORT="ttymxc1"
+# BR2_TARGET_GENERIC_GETTY_TTYMXC1 is not set
+BR2_TARGET_GENERIC_GETTY_TTYMXC2=y
+BR2_TARGET_GENERIC_GETTY_PORT="ttymxc2"
# BR2_TARGET_GENERIC_GETTY_BAUDRATE_KEEP is not set
# BR2_TARGET_GENERIC_GETTY_BAUDRATE_9600 is not set
# BR2_TARGET_GENERIC_GETTY_BAUDRATE_19200 is not set
diff --git a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
index d18fd86..bc72ae1 100644
--- a/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
+++ b/buildroot/target/device/armadeus/apf51/apf51-u-boot-2010.03.h
@@ -29,6 +29,9 @@
#define CONFIG_ENV_VERSION "0.4"
#define CONFIG_IDENT_STRING " apf51 patch 0.4"
+//#define APF51_PROTO
+//#define APF51_RECOVER
+
/* High Level Configuration Options */
#define CONFIG_ARMV7 1 /* This is armv7 Cortex-A8 CPU */
#define CONFIG_MX51 1 /* in a Freescale i.MX51 Chip */
@@ -59,7 +62,11 @@
* Select serial console configuration
*/
#define CONFIG_MXC_UART
+#ifdef APF51_PROTO
#define CONFIG_SYS_MX51_UART2 /* use UART2 for console */
+#else
+#define CONFIG_SYS_MX51_UART3 /* use UART3 for console */
+#endif
#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 }
#define CONFIG_BAUDRATE 115200
@@ -124,7 +131,7 @@
#define CONFIG_BOOTARGS \
CONFIG_CONSOLE " root=/dev/mtdblock4 rootfstype=jffs2 " MTDPARTS_DEFAULT
-#define CONFIG_CONSOLE "console=ttymxc1,"MK_STR(CONFIG_BAUDRATE)
+#define CONFIG_CONSOLE "console=ttymxc2,"MK_STR(CONFIG_BAUDRATE)
#define CONFIG_MTDMAP "mxc_nand"
#define MTDIDS_DEFAULT "nand0=" CONFIG_MTDMAP
#define MTDPARTS_DEFAULT "mtdparts=" CONFIG_MTDMAP ":1M(U-boot)ro," \
@@ -453,7 +460,7 @@
* SDRAM Configs
*/
#define CONFIG_SYS_NR_DRAM_BANKS 1
-#define CONFIG_SYS_SDRAM_MBYTE_SYZE 128
+#define CONFIG_SYS_SDRAM_MBYTE_SYZE 256
#define CONFIG_SYS_SDRAM_TYPE_MDDR
#define CONFIG_SYS_SDRAM_1_BASE CSD0_BASE_ADDR /* SDRAM bank #1 */
@@ -1132,3 +1139,7 @@
#endif /* __CONFIG_H */
+#ifdef CONFIG_BOARD_NAME
+#undef CONFIG_BOARD_NAME
+#endif
+#define CONFIG_BOARD_NAME apf51
diff --git a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
index 0f09eab..b72597d 100644
--- a/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
+++ b/buildroot/target/u-boot/u-boot-2010.03-401-apf51.patch
@@ -2,7 +2,7 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ u-boot-2010.03/board/armadeus/apf51/apf51.c 2011-01-05 18:11:15.000000000 +0100
-@@ -0,0 +1,1109 @@
+@@ -0,0 +1,1151 @@
+/*
+ * (C) Copyright 2010 Eric Jarrige, Armadeus Project
+ *
@@ -198,18 +198,21 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
+ /*
+ * uart3
+ */
-+ mxc_request_iomux(MX51_PIN_UART3_RXD, IOMUX_CONFIG_ALT0);
-+ mxc_request_iomux(MX51_PIN_UART3_TXD, IOMUX_CONFIG_ALT0);
-+ mxc_request_iomux(MX51_PIN_EIM_D27, IOMUX_CONFIG_ALT3);
-+ mxc_request_iomux(MX51_PIN_EIM_D24, IOMUX_CONFIG_ALT3);
++#ifdef APF51_RECOVER // temporary
++ mxc_request_iomux(MX51_PIN_AUD3_BB_RXD, IOMUX_CONFIG_ALT1);
++ mxc_request_iomux(MX51_PIN_AUD3_BB_FS, IOMUX_CONFIG_ALT1);
++ mxc_iomux_set_pad(MX51_PIN_AUD3_BB_RXD, UART_PAD_CFG);
++ mxc_iomux_set_pad(MX51_PIN_AUD3_BB_FS, UART_PAD_CFG);
++ mxc_iomux_set_input(MUX_IN_UART3_IPP_UART_RXD_MUX_SELECT_INPUT,INPUT_CTL_PATH2);dddd
++#else
++ mxc_request_iomux(MX51_PIN_UART3_RXD, IOMUX_CONFIG_ALT1);
++ mxc_request_iomux(MX51_PIN_UART3_TXD, IOMUX_CONFIG_ALT1);
+
+ mxc_iomux_set_pad(MX51_PIN_UART3_RXD, UART_PAD_CFG);
+ mxc_iomux_set_pad(MX51_PIN_UART3_TXD, UART_PAD_CFG);
-+ mxc_iomux_set_pad(MX51_PIN_EIM_D27, UART_PAD_CFG);
-+ mxc_iomux_set_pad(MX51_PIN_EIM_D24, UART_PAD_CFG);
+
-+ mxc_iomux_set_input(MUX_IN_UART3_IPP_UART_RTS_B_SELECT_INPUT,INPUT_CTL_PATH3);
+ mxc_iomux_set_input(MUX_IN_UART3_IPP_UART_RXD_MUX_SELECT_INPUT,INPUT_CTL_PATH4);
++#endif
+}
+
+void setup_audio(void)
@@ -518,22 +521,61 @@ Index: u-boot-2010.03/board/armadeus/apf51/apf51.c
+ /*
+ * Configure iomux for NFC interface
+ */
++#define NAND_PAD47K_CFG (PAD_CTL_DRV_VOT_HIGH | PAD_CTL_HYS_NONE | \
++ PAD_CTL_PKE_ENABLE | PAD_CTL_47K_PU | \
++ PAD_CTL_DRV_HIGH)
++
++#define NAND_PAD100K_CFG (PAD_CTL_DRV_VOT_HIGH | PAD_CTL_HYS_NONE | \
++ PAD_CTL_PKE_ENABLE | PAD_CTL_100K_PU | \
++ PAD_CTL_DRV_HIGH)
++
+ mxc_request_iomux(MX51_PIN_NANDF_WE_B, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_WE_B, NAND_PAD47K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_RE_B, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_RE_B, NAND_PAD47K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_ALE , IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_ALE , NAND_PAD47K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_CLE , IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_CLE , NAND_PAD47K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_WP_B, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_WP_B, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_RB0 , IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_RB0 , PAD_CTL_DRV_VOT_HIGH |
++ PAD_CTL_HYS_NONE | PAD_CTL_PKE_ENABLE |
++ PAD_CTL_PUE_PULL | PAD_CTL_100K_PU);
++
+ mxc_request_iomux(MX51_PIN_NANDF_CS0, IOMUX_CONFIG_ALT0);
+
++ /* MX51_PIN_NANDF_RDY_INT */
++
+ mxc_request_iomux(MX51_PIN_NANDF_D0, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D0, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D1, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D1, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D2, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D2, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D3, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D3, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D4, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D4, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D5, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D5, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D6, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D6, NAND_PAD100K_CFG);
++
+ mxc_request_iomux(MX51_PIN_NANDF_D7, IOMUX_CONFIG_ALT0);
++ mxc_iomux_set_pad(MX51_PIN_NANDF_D7, NAND_PAD100K_CFG);
+
+ writel(0, NFC_IPC);
+ NFC_SET_FW(1);
hooks/post-receive
--
armadeus
|
