Pull request: u-boot-arm/next into u-boot/next

Hi Tom,

The following changes since commit 661c21dd46e857b74682b0610d83cfea7f3ac3c2:

usb.h: Add udc_disconnect prototype to usb.h (2012-10-08 18:01:17 -0700)

are available in the git repository at:

git://git.denx.de/u-boot-arm next

for you to fetch changes up to 0d6b8f29a3c59306d6cd8f2baa92897f56b06695:

configs: mx6qsabre_common.h: Use default clock definitions (2012-10-09 16:52:18 +0200)

Lukasz Dalek (2):
h2200: Add support for iPAQ h2200 palmtop

Quoted 13 lines · Albert ARIBAUD

Hi Tom,

The following changes since commit 661c21dd46e857b74682b0610d83cfea7f3ac3c2:

usb.h: Add udc_disconnect prototype to usb.h (2012-10-08 18:01:17 -0700)

are available in the git repository at:

git://git.denx.de/u-boot-arm next

for you to fetch changes up to 0d6b8f29a3c59306d6cd8f2baa92897f56b06695:

configs: mx6qsabre_common.h: Use default clock definitions (2012-10-09 16:52:18 +0200)

[snip]

Quoted 2 lines

Lukasz Dalek (2):
h2200: Add support for iPAQ h2200 palmtop

This doesn't compile in next due to not having been updated for the serial changes:
serial_pxa.c:297:2: error: #error "Bad CONFIG_CONS_INDEX."

Do you want me to pull or do you want to fix this first? Thanks.

Hi ?ukasz,

Quoted 22 lines · Tom Rini

Quoted 13 lines · Albert ARIBAUD

Hi Tom,

The following changes since commit 661c21dd46e857b74682b0610d83cfea7f3ac3c2:

   usb.h: Add udc_disconnect prototype to usb.h (2012-10-08 18:01:17 -0700)

are available in the git repository at:

git://git.denx.de/u-boot-arm next

for you to fetch changes up to 0d6b8f29a3c59306d6cd8f2baa92897f56b06695:

   configs: mx6qsabre_common.h: Use default clock definitions (2012-10-09 16:52:18 +0200)

[snip]

Quoted 2 lines

Lukasz Dalek (2):
h2200: Add support for iPAQ h2200 palmtop

This doesn't compile in next due to not having been updated for the serial changes:
serial_pxa.c:297:2: error: #error "Bad CONFIG_CONS_INDEX."

Quoted 1 line

Do you want me to pull or do you want to fix this first? Thanks.

Cc ing Marek as PXA custodian and serial patcher...

?ukasz, can you have a look at why h2200 above u-boot/next fails to build, and can you quickly provide a new patch version to fix it?

Amicalement,

Define CONFIG_CONS_INDEX to use ffuart as default console and fix compilation error related to undefined CONFIG_CONS_INDEX.

Signed-off-by Lukasz Dalek <[email protected]>

---
 include/configs/h2200.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

include/configs/h2200.h +0 -0

index de5299b..ef14dd3 100644

Define CONFIG_CONS_INDEX to use ffuart as default console and fix compilation error related to undefined CONFIG_CONS_INDEX.

Signed-off-by Lukasz Dalek <[email protected]>

---
 include/configs/h2200.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

include/configs/h2200.h +0 -0

index de5299b..ef14dd3 100644

Hi Lukasz,

Quoted 13 lines · Lukasz Dalek

Define CONFIG_CONS_INDEX to use ffuart as default console and fix compilation error related to undefined CONFIG_CONS_INDEX.

Signed-off-by Lukasz Dalek <[email protected]>

---
 include/configs/h2200.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

include/configs/h2200.h +0 -0

index de5299b..ef14dd3 100644

include/configs/h2200.h line 130

Quoted 7 lines

include/configs/h2200.h +1 -0

@@ -124,6 +124,7 @@
 
 #define CONFIG_PXA_SERIAL
 #define CONFIG_FFUART
+#define CONFIG_CONS_INDEX		3
 
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 9600, 38400, 115200 }

This is actually a second patch, applying only above the first h2200 patch, which was removed from next because it did not build. If I accepted that second patch, then I'd have to accept the first one, which is precisely what I did not do, because I did not want the first commit introducing h2200 to be non-buildable. :(

Therefore I'd prefer that you squash both patches "h2200: Add support for iPAQ h2200" and "h2200: Make use of default_serial_console" together and post the result as "[PATCH V2] h2200: Add support for iPAQ h2200" with adequate version history, so that the commit in U-Boot which introduces h2200 actually builds successfully.

Hi Tom,

The following changes since commit 661c21dd46e857b74682b0610d83cfea7f3ac3c2:

usb.h: Add udc_disconnect prototype to usb.h (2012-10-08 18:01:17 -0700)

are available in the git repository at:

git://git.denx.de/u-boot-arm next

for you to fetch changes up to 0d6b8f29a3c59306d6cd8f2baa92897f56b06695:

configs: mx6qsabre_common.h: Use default clock definitions (2012-10-09 16:52:18 +0200)

----------------------------------------------------------------
Beno??t Th??baudeau (26):
mx5/6: Define default SoC input clock frequencies mx5 clocks: Cleanup
mx5: Use explicit clock gate names
mx5: Fix clock gate values
mx51: Fix USB PHY clocks
mx5 clocks: Add and use CCSR definitions mx5 clocks: Fix get_lp_apm()
mx5 clocks: Fix get_periph_clk()
mx5 clocks: Fix get_ipg_per_clk()
mx5 clocks: Fix get_uart_clk()
mx5 clocks: Simplify imx_get_cspiclk() mx5 clocks: Fix MXC_FEC_CLK
mx51: Fix I2C clock ID check
mx5/6 clocks: Fix SDHC clocks
mx25: Fix decode_pll
mx25: Clean up clock calculations
mx25: Define more standard clocks
mx25 clocks: Fix MXC_FEC_CLK
mx25: Clean up clocks API
mx25: Define cpu_eth_init() only if needed
mx25: Fix eSDHC support
mx5: Optimize lowlevel_init code size
mx31: Add more CCM access macros
mx35: Define MAX and AIPS registers
mx31: Fix PDR0_CSI_PODF
mx25: Clean up lowlevel_init

Eric Benard (1):
mx25: add CPU revision 1.2

Eric Nelson (7):
i.MX6: provide functional names for CCM_CCGR0-CCGR6 bit fields i.MX6: change register name for CCM_CHSCCDR to match ref. manual i.MX6: define bitfields for CHSCCDR register
i.MX6: define IOMUX_GPR3 register bitfields
i.MX6: Add ANATOP_PFD_480 bitfield constants
i.MX6: define struct iomuxc and IOMUX_GPR2 register bitfields i.MX6: get rid of redundant struct src_regs (dupe of struct src)

Fabio Estevam (8):
mx6q: Factor out common DDR3 init code
mx6: Add basic support for mx6qsabresd board.
mx6qsabresd: Add Ethernet support
mx6qsabresd: Add 8-bit USDHC support
configs: mx6: Add a common config file
mx6q: Add basic support for mx6qsabreauto
mx6qsabreauto: Add Ethernet support
configs: mx6qsabre_common.h: Use default clock definitions

Lucas Stach (6):
tegra20: complete periph_id enum
tegra20: add clock_set_pllout function
tegra20: rework UART GPIO handling
tegra: add funcmux entry for NAND attached to KBC
tegra: clean up board include hell
tegra: nand: add board pinmux

Lukasz Dalek (2):
h2200: Add support for iPAQ h2200 palmtop
pxa: Add code to examine cpu model and revision

Matthias Weisser (1):
imx: Use MXC_I2C_CLK in imx i2c driver

Otavio Salvador (1):
mx6qsabreauto: Use ttymxc3 as console

Stephen Warren (1):
tegra: enable CONFIG_CMD_PART

Thierry Reding (2):
tegra: Update Avionic Design vendor prefix
tegra: Rename Medcom to Medcom-Wide

Tom Warren (2):
Tegra20: Move some code files to common directories for upcoming Tegra30 patches.
Tegra20: Move some include files to arch-tegra for sharing with Tegra30

 MAINTAINERS                                        |    4 +-
 Makefile                                           |    2 +
 arch/arm/cpu/arm1136/mx31/generic.c                |    1 +
 arch/arm/cpu/arm1136/mx35/asm-offsets.c            |   33 +-
 arch/arm/cpu/arm1136/mx35/generic.c                |    1 +
 arch/arm/cpu/arm720t/tegra-common/Makefile         |   47 ++
 .../cpu/arm720t/{tegra20 => tegra-common}/cpu.h    |    0
 .../cpu/arm720t/{tegra20 => tegra-common}/spl.c    |   18 +-
 arch/arm/cpu/arm720t/tegra20/Makefile              |    1 -
 arch/arm/cpu/arm720t/tegra20/cpu.c                 |   12 +-
 arch/arm/cpu/arm926ejs/mx25/generic.c              |   66 +--
 arch/arm/cpu/armv7/mx5/clock.c                     |  454 +++++++++++---------
 arch/arm/cpu/armv7/mx5/lowlevel_init.S             |  112 ++---
 arch/arm/cpu/armv7/mx6/clock.c                     |   31 +-
 arch/arm/cpu/armv7/mx6/soc.c                       |    2 +-
 arch/arm/cpu/armv7/tegra-common/Makefile           |   48 +++
 .../armv7/{tegra20 => tegra-common}/cmd_enterrcm.c |    4 +-
 arch/arm/cpu/armv7/tegra20/Makefile                |    1 -
 arch/arm/cpu/armv7/tegra20/usb.c                   |    8 +-
 arch/arm/cpu/pxa/cpuinfo.c                         |   11 +-
 arch/arm/cpu/tegra-common/Makefile                 |   48 +++
 .../{tegra20-common/ap20.c => tegra-common/ap.c}   |   12 +-
 .../cpu/{tegra20-common => tegra-common}/board.c   |    9 +-
 .../lowlevel_init.S                                |    0
 .../{tegra20-common => tegra-common}/sys_info.c    |    0
 .../cpu/{tegra20-common => tegra-common}/timer.c   |    4 +-
 arch/arm/cpu/tegra20-common/Makefile               |    3 +-
 arch/arm/cpu/tegra20-common/clock.c                |   47 +-
 arch/arm/cpu/tegra20-common/emc.c                  |    4 +-
 arch/arm/cpu/tegra20-common/funcmux.c              |   19 +-
 arch/arm/cpu/tegra20-common/pinmux.c               |    4 +-
 arch/arm/cpu/tegra20-common/pmu.c                  |    8 +-
 arch/arm/cpu/tegra20-common/warmboot.c             |   18 +-
 arch/arm/cpu/tegra20-common/warmboot_avp.c         |   14 +-
 arch/arm/imx-common/speed.c                        |   18 +-
 arch/arm/imx-common/timer.c                        |   12 +-
 arch/arm/include/asm/arch-mx25/clock.h             |   14 +-
 arch/arm/include/asm/arch-mx25/imx-regs.h          |    1 +
 arch/arm/include/asm/arch-mx25/macro.h             |   87 +++-
 arch/arm/include/asm/arch-mx31/clock.h             |    1 +
 arch/arm/include/asm/arch-mx31/imx-regs.h          |   16 +-
 arch/arm/include/asm/arch-mx35/clock.h             |    1 +
 arch/arm/include/asm/arch-mx35/imx-regs.h          |   52 +++
 arch/arm/include/asm/arch-mx5/clock.h              |   22 +-
 arch/arm/include/asm/arch-mx5/crm_regs.h           |  419 +++++++++++++++++-
 arch/arm/include/asm/arch-mx6/clock.h              |   15 +
 arch/arm/include/asm/arch-mx6/crm_regs.h           |  364 ++++++++--------
 arch/arm/include/asm/arch-mx6/imx-regs.h           |  166 ++++++-
 arch/arm/include/asm/arch-pxa/pxa.h                |   13 +
 .../asm/{arch-tegra20/ap20.h => arch-tegra/ap.h}   |    0
 .../asm/{arch-tegra20 => arch-tegra}/board.h       |   20 +-
 .../asm/{arch-tegra20 => arch-tegra}/clk_rst.h     |   11 +-
 arch/arm/include/asm/arch-tegra/clock.h            |  265 ++++++++++++
 .../asm/{arch-tegra20 => arch-tegra}/fuse.h        |    0
 .../arm/include/asm/arch-tegra/gpio.h              |   27 +-
 .../include/asm/{arch-tegra20 => arch-tegra}/mmc.h |    0
 .../include/asm/{arch-tegra20 => arch-tegra}/pmc.h |    0
 .../include/asm/{arch-tegra20 => arch-tegra}/scu.h |    0
 .../asm/{arch-tegra20 => arch-tegra}/sys_proto.h   |    0
 .../{arch-tegra20/tegra20.h => arch-tegra/tegra.h} |   14 +-
 .../asm/{arch-tegra20 => arch-tegra}/tegra_i2c.h   |    4 +-
 .../asm/{arch-tegra20 => arch-tegra}/tegra_mmc.h   |    0
 .../asm/{arch-tegra20 => arch-tegra}/tegra_spi.h   |    0
 .../asm/{arch-tegra20 => arch-tegra}/timer.h       |    0
 .../asm/{arch-tegra20 => arch-tegra}/uart.h        |    0
 .../asm/{arch-tegra20 => arch-tegra}/warmboot.h    |    0
 arch/arm/include/asm/arch-tegra20/clock-tables.h   |  196 +++++++++
 arch/arm/include/asm/arch-tegra20/clock.h          |  388 +----------------
 arch/arm/include/asm/arch-tegra20/funcmux.h        |    1 +
 arch/arm/include/asm/arch-tegra20/gpio.h           |   22 +-
 .../board.h => include/asm/arch-tegra20/tegra.h}   |   17 +-
 board/avionic-design/common/tamonten.c             |   20 +-
 ...{tegra20-medcom.dts => tegra20-medcom-wide.dts} |    2 +-
 board/avionic-design/dts/tegra20-plutux.dts        |    2 +-
 board/avionic-design/dts/tegra20-tec.dts           |    2 +-
 .../{medcom => medcom-wide}/Makefile               |    0
 board/compal/paz00/paz00.c                         |   11 +-
 board/compulab/trimslice/trimslice.c               |   13 +-
 .../imximage.cfg => imx/ddr/mx6q_4x_mt41j128.cfg}  |    0
 board/freescale/mx31ads/lowlevel_init.S            |    4 +-
 board/freescale/mx53loco/mx53loco.c                |    2 +-
 board/freescale/mx6qsabreauto/Makefile             |   41 ++
 board/freescale/mx6qsabreauto/imximage.cfg         |  159 +++++++
 board/freescale/mx6qsabreauto/mx6qsabreauto.c      |  192 +++++++++
 board/freescale/mx6qsabresd/Makefile               |   41 ++
 board/freescale/mx6qsabresd/mx6qsabresd.c          |  198 +++++++++
 board/h2200/Makefile                               |   49 +++
 board/h2200/h2200-header.S                         |   27 ++
 board/h2200/h2200.c                                |   53 +++
 board/hale/tt01/tt01.c                             |    2 +-
 board/imx31_phycore/lowlevel_init.S                |    2 +-
 board/karo/tx25/lowlevel_init.S                    |   34 +-
 board/logicpd/imx31_litekit/lowlevel_init.S        |    2 +-
 board/nvidia/common/board.c                        |   42 +-
 board/nvidia/common/emc.c                          |    8 +-
 board/nvidia/common/uart-spi-switch.c              |    6 +-
 board/nvidia/harmony/harmony.c                     |   11 +-
 board/nvidia/seaboard/seaboard.c                   |    6 +-
 board/nvidia/whistler/whistler.c                   |   13 +-
 boards.cfg                                         |    7 +-
 drivers/gpio/tegra_gpio.c                          |    2 +-
 drivers/i2c/mxc_i2c.c                              |    4 +-
 drivers/i2c/tegra_i2c.c                            |    4 +-
 drivers/input/tegra-kbc.c                          |    2 +-
 drivers/mmc/tegra_mmc.c                            |    6 +-
 drivers/mtd/nand/tegra_nand.c                      |    6 +-
 drivers/spi/tegra_spi.c                            |    7 +-
 drivers/usb/host/ehci-mx5.c                        |    3 +-
 drivers/video/ipu_common.c                         |   12 +-
 include/configs/h2200.h                            |  156 +++++++
 include/configs/ima3-mx53.h                        |    3 -
 include/configs/{medcom.h => medcom-wide.h}        |    8 +-
 include/configs/mx31pdk.h                          |   10 +-
 include/configs/mx51_efikamx.h                     |    2 -
 include/configs/mx51evk.h                          |    2 -
 include/configs/mx53ard.h                          |    2 -
 include/configs/mx53evk.h                          |    2 -
 include/configs/mx53loco.h                         |    2 -
 include/configs/mx53smd.h                          |    2 -
 include/configs/mx6qarm2.h                         |    2 -
 include/configs/mx6qsabre_common.h                 |  177 ++++++++
 include/configs/mx6qsabreauto.h                    |   22 +
 include/configs/mx6qsabrelite.h                    |    2 -
 include/configs/mx6qsabresd.h                      |   27 ++
 include/configs/tegra-common-post.h                |    9 +
 include/configs/tegra20-common.h                   |    4 +-
 include/configs/vision2.h                          |    2 -
 spl/Makefile                                       |    2 +
 128 files changed, 3423 insertions(+), 1220 deletions(-)
 create mode 100644 arch/arm/cpu/arm720t/tegra-common/Makefile
 rename arch/arm/cpu/arm720t/{tegra20 => tegra-common}/cpu.h (100%)
 rename arch/arm/cpu/arm720t/{tegra20 => tegra-common}/spl.c (91%)
 create mode 100644 arch/arm/cpu/armv7/tegra-common/Makefile
 rename arch/arm/cpu/armv7/{tegra20 => tegra-common}/cmd_enterrcm.c (96%)
 create mode 100644 arch/arm/cpu/tegra-common/Makefile
 rename arch/arm/cpu/{tegra20-common/ap20.c => tegra-common/ap.c} (95%)
 rename arch/arm/cpu/{tegra20-common => tegra-common}/board.c (94%)
 rename arch/arm/cpu/{tegra20-common => tegra-common}/lowlevel_init.S (100%)
 rename arch/arm/cpu/{tegra20-common => tegra-common}/sys_info.c (100%)
 rename arch/arm/cpu/{tegra20-common => tegra-common}/timer.c (97%)
 rename arch/arm/include/asm/{arch-tegra20/ap20.h => arch-tegra/ap.h} (100%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/board.h (54%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/clk_rst.h (95%)
 create mode 100644 arch/arm/include/asm/arch-tegra/clock.h
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/fuse.h (100%)
 rename board/nvidia/common/board.h => arch/arm/include/asm/arch-tegra/gpio.h (62%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/mmc.h (100%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/pmc.h (100%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/scu.h (100%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/sys_proto.h (100%)
 rename arch/arm/include/asm/{arch-tegra20/tegra20.h => arch-tegra/tegra.h} (90%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/tegra_i2c.h (98%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/tegra_mmc.h (100%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/tegra_spi.h (100%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/timer.h (100%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/uart.h (100%)
 rename arch/arm/include/asm/{arch-tegra20 => arch-tegra}/warmboot.h (100%)
 create mode 100644 arch/arm/include/asm/arch-tegra20/clock-tables.h
 rename arch/arm/{cpu/arm720t/tegra20/board.h => include/asm/arch-tegra20/tegra.h} (73%)
 rename board/avionic-design/dts/{tegra20-medcom.dts => tegra20-medcom-wide.dts} (92%)
 rename board/avionic-design/{medcom => medcom-wide}/Makefile (100%)
 rename board/freescale/{mx6qsabrelite/imximage.cfg => imx/ddr/mx6q_4x_mt41j128.cfg} (100%)
 create mode 100644 board/freescale/mx6qsabreauto/Makefile
 create mode 100644 board/freescale/mx6qsabreauto/imximage.cfg
 create mode 100644 board/freescale/mx6qsabreauto/mx6qsabreauto.c
 create mode 100644 board/freescale/mx6qsabresd/Makefile
 create mode 100644 board/freescale/mx6qsabresd/mx6qsabresd.c

 create mode 100644 board/h2200/Makefile
 create mode 100644 board/h2200/h2200-header.S
 create mode 100644 board/h2200/h2200.c
 create mode 100644 include/configs/h2200.h
 rename include/configs/{medcom.h => medcom-wide.h} (89%)
 create mode 100644 include/configs/mx6qsabre_common.h
 create mode 100644 include/configs/mx6qsabreauto.h
 create mode 100644 include/configs/mx6qsabresd.h