September 2012 - U-Boot

[U-Boot] [PATCH] TQM8xx: adjust linker script to grown code size
by Wolfgang Denk 03 Oct '12

03 Oct '12

Some of the previous changes caused the code to grow, which causes errors like u-boot.lds:76 cannot move location counter backwards (from 4000828c to 40008000) when building with some older tool chains (like ELDK 4.2). Adjust the linker script to make fit again. Signed-off-by: Wolfgang Denk <wd(a)denx.de> --- board/tqc/tqm8xx/u-boot.lds | 2 -- 1 file changed, 2 deletions(-) This fixes the autobuilder errors for TQM855L, TQM860L and TQM862L. diff --git a/board/tqc/tqm8xx/u-boot.lds b/board/tqc/tqm8xx/u-boot.lds index 4f08be6..e905c26 100644 --- a/board/tqc/tqm8xx/u-boot.lds +++ b/board/tqc/tqm8xx/u-boot.lds @@ -43,8 +43,6 @@ SECTIONS drivers/pcmcia/libpcmcia.o (.text.pcmcia_hardware_enable) drivers/rtc/librtc.o (.text*) drivers/misc/libmisc.o (.text*) - *(.text.print_buffer) - *(.text.print_size) . = DEFINED(env_offset) ? env_offset : .; common/env_embedded.o (.ppcenv*) -- 1.7.11.4

3 4

[U-Boot] [PATCH 1/2] openrisc/bitops: add hweightX defines
by Stefan Kristiansson 03 Oct '12

03 Oct '12

Signed-off-by: Stefan Kristiansson <stefan.kristiansson(a)saunalahti.fi> --- arch/openrisc/include/asm/bitops.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/arch/openrisc/include/asm/bitops.h b/arch/openrisc/include/asm/bitops.h index c001a5d..c76a409 100644 --- a/arch/openrisc/include/asm/bitops.h +++ b/arch/openrisc/include/asm/bitops.h @@ -25,4 +25,8 @@ #define PLATFORM_FFS #include <asm/bitops/ffs.h> +#define hweight32(x) generic_hweight32(x) +#define hweight16(x) generic_hweight16(x) +#define hweight8(x) generic_hweight8(x) + #endif /* __ASM_GENERIC_BITOPS_H */ -- 1.7.5.4

5 8

[U-Boot] [PULL] u-boot-testing / dm-stringify
by Marek Vasut 02 Oct '12

02 Oct '12

Please apply to u-boot/next. They are now compile tested on arm and ppc. Albert's comment addresses and patches are assigned to Tom in PW. The following changes since commit d05eb7acf0f6ad5682ab75c25af52921e9fa5863: MAINTAINERS: Move dbau1x00 to orphaned. (2012-09-27 13:04:42 -0700) are available in the git repository at: git://git.denx.de/u-boot-testing.git dm-stringify for you to fetch changes up to 30d05ab5304eb34b15550ea95258b18904f3991c: COMMON: Use __stringify() instead of rest of implementations (2012-09-29 02:09:01 +0200) ---------------------------------------------------------------- Marek Vasut (4): COMMON: Add __stringify() function COMMON: Use __stringify() instead of xstr() COMMON: Use __stringify() instead of MK_STR() COMMON: Use __stringify() instead of rest of implementations arch/blackfin/include/asm/config-pre.h | 2 -- arch/blackfin/lib/board.c | 2 +- board/logicpd/zoom2/zoom2_serial.h | 7 +++---- board/w7o/w7o.c | 9 +------- common/cmd_nvedit.c | 5 +---- common/env_common.c | 34 ++++++++++++++---------------- common/env_embedded.c | 40 +++++++++++++++-------------------- include/common.h | 1 + include/configs/M52277EVB.h | 18 ++++++++-------- include/configs/M5253DEMO.h | 2 +- include/configs/M5373EVB.h | 2 +- include/configs/M54451EVB.h | 10 ++++----- include/configs/M54455EVB.h | 16 +++++++------- include/configs/MERGERBOX.h | 24 ++++++++------------- include/configs/MPC8260ADS.h | 22 +++++++++---------- include/configs/MPC8308RDB.h | 9 +++----- include/configs/MPC8313ERDB.h | 21 +++++++++---------- include/configs/MPC8323ERDB.h | 21 +++++++++---------- include/configs/MPC8349ITX.h | 33 +++++++++++++++-------------- include/configs/MPC837XERDB.h | 21 +++++++++---------- include/configs/MPC8536DS.h | 35 ++++++++++++++++++------------- include/configs/MPC8544DS.h | 33 ++++++++++++++++------------- include/configs/MPC8548CDS.h | 17 +++++++++------ include/configs/MPC8572DS.h | 35 ++++++++++++++++++------------- include/configs/MPC8610HPCD.h | 93 +++++++++++++++++++++++++++++++++++++++++++-------------------------------------- include/configs/MPC8641HPCN.h | 17 +++++++++------ include/configs/MVBC_P.h | 38 ++++++++++++++------------------- include/configs/MVBLM7.h | 26 +++++++++++------------ include/configs/MVSMR.h | 30 +++++++++++--------------- include/configs/P1010RDB.h | 4 ++-- include/configs/P1022DS.h | 4 ++-- include/configs/P1_P2_RDB.h | 19 ++++++++++------- include/configs/P2020DS.h | 36 +++++++++++++++---------------- include/configs/P2041RDB.h | 6 +++--- include/configs/SIMPC8313.h | 21 +++++++++---------- include/configs/TQM85xx.h | 12 ++++++----- include/configs/amcc-common.h | 25 ++++++++++------------ include/configs/astro_mcf5373l.h | 7 +++---- include/configs/at91sam9263ek.h | 5 +---- include/configs/bf537-minotaur.h | 2 +- include/configs/bf537-srv1.h | 2 +- include/configs/bfin_adi_common.h | 13 ++++++------ include/configs/blackstamp.h | 10 ++++----- include/configs/blackvme.h | 6 +++--- include/configs/cam_enc_4xx.h | 36 +++++++++++++++---------------- include/configs/corenet_ds.h | 6 +++--- include/configs/ea20.h | 11 ++++------ include/configs/enbw_cmc.h | 19 +++++++---------- include/configs/flea3.h | 14 ++++++------- include/configs/ima3-mx53.h | 10 ++++----- include/configs/imx27lite-common.h | 15 ++++++------- include/configs/km/keymile-common.h | 13 +++++------- include/configs/km/km-powerpc.h | 12 +++++------ include/configs/km/km_arm.h | 14 ++++++------- include/configs/linkstation.h | 9 +++----- include/configs/lsxl.h | 4 ++-- include/configs/manroland/common.h | 21 ++++++++----------- include/configs/mcc200.h | 9 ++------ include/configs/mpc8308_p1m.h | 9 +++----- include/configs/mx35pdk.h | 14 ++++++------- include/configs/p1_p2_rdb_pc.h | 22 +++++++++---------- include/configs/qong.h | 9 +++----- include/configs/sbc8548.h | 26 +++++++++++------------ include/configs/tam3517-common.h | 11 ++++------ include/configs/tegra20-common.h | 12 +++-------- include/configs/tx25.h | 5 +---- include/configs/ve8313.h | 21 +++++++------------ include/configs/xpedite1000.h | 6 +++--- include/configs/xpedite517x.h | 12 +++++------ include/configs/xpedite520x.h | 12 +++++------ include/configs/xpedite537x.h | 12 +++++------ include/configs/xpedite550x.h | 12 +++++------ include/linux/stringify.h | 12 +++++++++++ include/nios2.h | 5 +++-- tools/env/fw_env.c | 37 +++++++++++++++----------------- 75 files changed, 583 insertions(+), 642 deletions(-) create mode 100644 include/linux/stringify.h

2 1

[U-Boot] [PATCH 00/16] pmic: Redesign PMIC framework to support multiple instances of devices
by Lukasz Majewski 02 Oct '12

02 Oct '12

PMIC framework has been redesigned to support multiple instances of power related devices (e.g. fuel gauge, PMICs, chargers, micro USB IC). Due to that, code at other architectures and boards have been adjusted properly. New power_board_init() method at ./lib/board.c file has been introduced. It is meant to be an architecture dependent function to support advanced power management. Since PMIC framework uses lists internally to link different devices, its initialization must be done just after malloc initialization. Please consider commits from this patch set as the example of advanced power management for a particular HW (Trats board in this case). In the new approach PMICs are selected with their names (e.g. 'pmic dump MAX8997_PMIC') Presented patch set is a first step to change 'pmic' command to more generic (i.e. power) to provide control for multiple devices. Dependencies: 1. gpio:fix: Proper handling of GPIO subsystem parts at Samsung devices http://patchwork.ozlabs.org/patch/181768/ 2. i2c:soft:multi: Support for multiple soft I2C buses at Samsung boards http://patchwork.ozlabs.org/patch/181789/ 3. i2c:soft:multi: Enable soft I2C multibus at Trats development board http://patchwork.ozlabs.org/patch/181788/ Test HW: - Exynos4210 Trats development board Lukasz Majewski (16): pmic:i2c: Handle PMIC I2C transmission comprising of two bytes pmic:i2c: Add I2C byte order to PMIC framework pmic:max8997: Switch the MAX8997 PMIC to be used with multibus I2C pmic: Extend PMIC framework to support multiple instances of PMIC devices pmic: Introduce power_board_init() method at ./lib/board.c file pmic: Enable power_board_init() support at TRATS pmic:chrg: Common information about charger and battery (power_chrg.h) pmic:muic: Support for MUIC built into MAX8997 device pmic:fuel-gauge: Support for MAX17042 fuel-gauge pmic:max8997: Function for calculating LDO internal register value arm:trats:pmic: Default PMIC(MAX8997) initialization for Samsung's TRATS board arm:trats:pmic: Enable MUIC (MAX8997) at Samsung's TRATS board arm:trats:pmic: Enable fuel-gauge (MAX17042) at Samsung's TRATS board pmic:max8997: Support for MAX8997 internal charger control arm:trats:pmic: Support for charging battery at Samsung's TRATS board arm:trats:pmic: Power consumption reduction state for Samsung's TRATS board arch/arm/lib/board.c | 4 + board/davedenx/qong/qong.c | 6 +- board/freescale/mx31pdk/mx31pdk.c | 6 +- board/freescale/mx35pdk/mx35pdk.c | 8 +- board/freescale/mx51evk/mx51evk.c | 6 +- board/freescale/mx53evk/mx53evk.c | 6 +- board/freescale/mx53loco/mx53loco.c | 10 +- board/hale/tt01/tt01.c | 6 +- board/samsung/goni/goni.c | 9 +- board/samsung/trats/trats.c | 259 ++++++++++++++++++++++++++++- board/samsung/universal_c210/universal.c | 10 +- board/ttcontrol/vision2/vision2.c | 6 +- drivers/misc/Makefile | 2 + drivers/misc/fg_max17042.c | 235 +++++++++++++++++++++++++++ drivers/misc/muic_max8997.c | 80 +++++++++ drivers/misc/pmic_core.c | 108 +++++++++---- drivers/misc/pmic_dialog.c | 8 +- drivers/misc/pmic_fsl.c | 8 +- drivers/misc/pmic_i2c.c | 40 ++++- drivers/misc/pmic_max8997.c | 80 +++++++++- drivers/misc/pmic_max8998.c | 10 +- drivers/misc/pmic_spi.c | 4 +- drivers/rtc/mc13xxx-rtc.c | 6 +- include/common.h | 3 + include/configs/trats.h | 7 + include/power/fg_battery_cell_params.h | 88 ++++++++++ include/power/max17042_fg.h | 74 +++++++++ include/power/max8997_muic.h | 61 +++++++ include/{ => power}/max8997_pmic.h | 27 +++- include/{ => power}/max8998_pmic.h | 0 include/{ => power}/pmic.h | 20 ++- include/power/power_chrg.h | 56 +++++++ 32 files changed, 1143 insertions(+), 110 deletions(-) create mode 100644 drivers/misc/fg_max17042.c create mode 100644 drivers/misc/muic_max8997.c create mode 100644 include/power/fg_battery_cell_params.h create mode 100644 include/power/max17042_fg.h create mode 100644 include/power/max8997_muic.h rename include/{ => power}/max8997_pmic.h (87%) rename include/{ => power}/max8998_pmic.h (100%) rename include/{ => power}/pmic.h (80%) create mode 100644 include/power/power_chrg.h -- 1.7.2.3

4 34

[U-Boot] include: fix mips64 build warning
by Zhi-zhou Zhang 02 Oct '12

02 Oct '12

fix warnings when building mips64, we define CONFIG_MIPS64 in config file. And this macro decides size_t. hashtable.c: In function 'hexport_r': hashtable.c:495:2: warning: format '%zu' expects argument of type 'size_t', but argument 5 has type 'unsigned int' [-Wformat] hashtable.c:554:5: warning: format '%zu' expects argument of type 'size_t', but argument 2 has type 'unsigned int' [-Wformat] hashtable.c:554:5: warning: format '%zu' expects argument of type 'size_t', but argument 3 has type 'unsigned int' [-Wformat] hashtable.c: In function 'himport_r': hashtable.c:654:3: warning: format '%zu' expects argument of type 'size_t', but argument 2 has type 'unsigned int' [-Wformat] Signed-off-by: Zhi-zhou Zhang <etou.zh(a)gmail.com> --- include/linux/types.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/linux/types.h b/include/linux/types.h index 1b0b4a4..33ee095 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -4,6 +4,7 @@ #ifdef __KERNEL__ #include <linux/config.h> #endif +#include <config.h> #include <linux/posix_types.h> #include <asm/types.h> -- 1.7.9.5

2 3

[U-Boot] [PATCH] pmc405de and zeus: remove the env_ptr externs
by Igor Grinberg 02 Oct '12

02 Oct '12

The env_ptr is already declared in environment.h, so there is no need to redeclare in board files (especially after including the environment.h) Remove those declarations. Signed-off-by: Igor Grinberg <grinberg(a)compulab.co.il> Cc: Stefan Roese <sr(a)denx.de> Cc: Matthias Fuchs <matthias.fuchs(a)esd-electronics.com> --- Stefan, Matthias, I'm sending from my laptop (not my main development machine) which does not have the ppc tool chain installed, can you please compile test these two boards? Thanks! board/esd/pmc405de/pmc405de.c | 1 - board/zeus/zeus.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/board/esd/pmc405de/pmc405de.c b/board/esd/pmc405de/pmc405de.c index a60809a..279d7d4 100644 --- a/board/esd/pmc405de/pmc405de.c +++ b/board/esd/pmc405de/pmc405de.c @@ -415,7 +415,6 @@ U_BOOT_CMD(eepwren, 2, 0, do_eep_wren, #if defined(CONFIG_PRAM) #include <environment.h> -extern env_t *env_ptr; int do_painit(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { diff --git a/board/zeus/zeus.c b/board/zeus/zeus.c index 272e59b..e7b2f4d 100644 --- a/board/zeus/zeus.c +++ b/board/zeus/zeus.c @@ -39,7 +39,6 @@ DECLARE_GLOBAL_DATA_PTR; #define REBOOT_DO_POST 0x00000001 extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */ -extern env_t *env_ptr; ulong flash_get_size(ulong base, int banknum); void env_crc_update(void); -- 1.7.3.4

3 2

[U-Boot] [PATCH v3 0/2] Tegra 2 USB ULPI series
by Lucas Stach 02 Oct '12

02 Oct '12

Hopefully final round of the Tegra ULPI patchset. This is just the USB part that can go in through the u-boot-usb tree. This was again tested on the Toradex Colibri T20, without any regressions. v2 of the patches were Tested-by: Stephen Warren <swarren(a)wwwdotorg.org> v3 incorporates Igors feedback. Lucas Stach (2): usb: ulpi: add indicator configuration function tegra20: add USB ULPI init code README | 3 + arch/arm/cpu/armv7/tegra20/usb.c | 152 +++++++++++++++++++++++++++----- arch/arm/include/asm/arch-tegra20/usb.h | 29 ++++-- drivers/usb/ulpi/ulpi.c | 32 ++++++- include/usb/ulpi.h | 13 ++- 5 Dateien geändert, 196 Zeilen hinzugefügt(+), 33 Zeilen entfernt(-) -- 1.7.11.4

2 6

[U-Boot] [PATCH 00/10] mx5: Fix clocks
by Benoît Thébaudeau 02 Oct '12

02 Oct '12

Hi all, This series fixes the mx5 clocks. The previous code was full of bugs and missing parts. There is nothing special to say for each patch. Everything comes from the reference manuals. Best regards, Benoît

4 51

[U-Boot] [PATCH] mx6qsabreauto: Add Ethernet support
by Fabio Estevam 02 Oct '12

02 Oct '12

mx6qsabreauto has a AR8031 Gigabit PHY. Add support for it. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx6qsabreauto/mx6qsabreauto.c | 75 +++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/board/freescale/mx6qsabreauto/mx6qsabreauto.c b/board/freescale/mx6qsabreauto/mx6qsabreauto.c index 8913b21..656329b 100644 --- a/board/freescale/mx6qsabreauto/mx6qsabreauto.c +++ b/board/freescale/mx6qsabreauto/mx6qsabreauto.c @@ -28,6 +28,8 @@ #include <asm/imx-common/iomux-v3.h> #include <mmc.h> #include <fsl_esdhc.h> +#include <miiphy.h> +#include <netdev.h> DECLARE_GLOBAL_DATA_PTR; #define UART_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ @@ -38,6 +40,10 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_PUS_47K_UP | PAD_CTL_SPEED_LOW | \ PAD_CTL_DSE_80ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) +#define ENET_PAD_CTRL (PAD_CTL_PKE | PAD_CTL_PUE | \ + PAD_CTL_PUS_100K_UP | PAD_CTL_SPEED_MED | \ + PAD_CTL_DSE_40ohm | PAD_CTL_HYS) + int dram_init(void) { gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE); @@ -50,6 +56,29 @@ iomux_v3_cfg_t uart4_pads[] = { MX6Q_PAD_KEY_ROW0__UART4_RXD | MUX_PAD_CTRL(UART_PAD_CTRL), }; +iomux_v3_cfg_t enet_pads[] = { + MX6Q_PAD_KEY_COL1__ENET_MDIO | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_KEY_COL2__ENET_MDC | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_TXC__ENET_RGMII_TXC | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_TD0__ENET_RGMII_TD0 | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_TD1__ENET_RGMII_TD1 | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_TD2__ENET_RGMII_TD2 | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_TD3__ENET_RGMII_TD3 | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_TX_CTL__RGMII_TX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_ENET_REF_CLK__ENET_TX_CLK | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_RXC__ENET_RGMII_RXC | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_RD0__ENET_RGMII_RD0 | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_RD1__ENET_RGMII_RD1 | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_RD2__ENET_RGMII_RD2 | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_RD3__ENET_RGMII_RD3 | MUX_PAD_CTRL(ENET_PAD_CTRL), + MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL | MUX_PAD_CTRL(ENET_PAD_CTRL), +}; + +static void setup_iomux_enet(void) +{ + imx_iomux_v3_setup_multiple_pads(enet_pads, ARRAY_SIZE(enet_pads)); +} + iomux_v3_cfg_t usdhc3_pads[] = { MX6Q_PAD_SD3_CLK__USDHC3_CLK | MUX_PAD_CTRL(USDHC_PAD_CTRL), MX6Q_PAD_SD3_CMD__USDHC3_CMD | MUX_PAD_CTRL(USDHC_PAD_CTRL), @@ -89,6 +118,52 @@ int board_mmc_init(bd_t *bis) } #endif +int mx6_rgmii_rework(struct phy_device *phydev) +{ + unsigned short val; + + /* To enable AR8031 ouput a 125MHz clk from CLK_25M */ + phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x7); + phy_write(phydev, MDIO_DEVAD_NONE, 0xe, 0x8016); + phy_write(phydev, MDIO_DEVAD_NONE, 0xd, 0x4007); + + val = phy_read(phydev, MDIO_DEVAD_NONE, 0xe); + val &= 0xffe3; + val |= 0x18; + phy_write(phydev, MDIO_DEVAD_NONE, 0xe, val); + + /* introduce tx clock delay */ + phy_write(phydev, MDIO_DEVAD_NONE, 0x1d, 0x5); + val = phy_read(phydev, MDIO_DEVAD_NONE, 0x1e); + val |= 0x0100; + phy_write(phydev, MDIO_DEVAD_NONE, 0x1e, val); + + return 0; +} + +int board_phy_config(struct phy_device *phydev) +{ + mx6_rgmii_rework(phydev); + + if (phydev->drv->config) + phydev->drv->config(phydev); + + return 0; +} + +int board_eth_init(bd_t *bis) +{ + int ret; + + setup_iomux_enet(); + + ret = cpu_eth_init(bis); + if (ret) + printf("FEC MXC: %s:failed\n", __func__); + + return 0; +} + u32 get_board_rev(void) { return 0x63000; -- 1.7.9.5

3 3

[U-Boot] [PATCH] mx25: Clean up lowlevel_init
by Benoît Thébaudeau 02 Oct '12

02 Oct '12

Clean up mx25 lowlevel_init: - Add comments. - Do not use write32 repeatedly with the same value in order no to increase code size. - Make register values configurable. - Use defined values instead of literal constants. - Use defined macros instead of duplicating code. Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Cc: Stefano Babic <sbabic(a)denx.de> --- .../arch/arm/include/asm/arch-mx25/macro.h | 57 +++++++++++++------- .../board/karo/tx25/lowlevel_init.S | 37 +++---------- .../board/syteco/zmx25/lowlevel_init.S | 6 +++ 3 files changed, 51 insertions(+), 49 deletions(-) diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx25/macro.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx25/macro.h index 3b694da..9550ade 100644 --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx25/macro.h +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx25/macro.h @@ -32,32 +32,49 @@ #include <asm/arch/imx-regs.h> #include <generated/asm-offsets.h> +#include <asm/macro.h> +/* + * AIPS setup - Only setup MPROTx registers. + * The PACR default values are good. + */ .macro init_aips - write32 IMX_AIPS1_BASE + AIPS_MPR_0_7, 0x77777777 - write32 IMX_AIPS1_BASE + AIPS_MPR_8_15, 0x77777777 - write32 IMX_AIPS2_BASE + AIPS_MPR_0_7, 0x77777777 - write32 IMX_AIPS2_BASE + AIPS_MPR_8_15, 0x77777777 + ldr r0, =IMX_AIPS1_BASE + ldr r1, =AIPS_MPR_CONFIG + str r1, [r0, #AIPS_MPR_0_7] + str r1, [r0, #AIPS_MPR_8_15] + ldr r2, =IMX_AIPS2_BASE + str r1, [r2, #AIPS_MPR_0_7] + str r1, [r2, #AIPS_MPR_8_15] .endm +/* MAX (Multi-Layer AHB Crossbar Switch) setup */ .macro init_max - write32 IMX_MAX_BASE + MAX_MPR0, 0x43210 - write32 IMX_MAX_BASE + MAX_MPR1, 0x43210 - write32 IMX_MAX_BASE + MAX_MPR2, 0x43210 - write32 IMX_MAX_BASE + MAX_MPR3, 0x43210 - write32 IMX_MAX_BASE + MAX_MPR4, 0x43210 - - write32 IMX_MAX_BASE + MAX_SGPCR0, 0x10 - write32 IMX_MAX_BASE + MAX_SGPCR1, 0x10 - write32 IMX_MAX_BASE + MAX_SGPCR2, 0x10 - write32 IMX_MAX_BASE + MAX_SGPCR3, 0x10 - write32 IMX_MAX_BASE + MAX_SGPCR4, 0x10 + ldr r0, =IMX_MAX_BASE + ldr r1, =MAX_MPR_CONFIG + str r1, [r0, #MAX_MPR0] /* for S0 */ + str r1, [r0, #MAX_MPR1] /* for S1 */ + str r1, [r0, #MAX_MPR2] /* for S2 */ + str r1, [r0, #MAX_MPR3] /* for S3 */ + str r1, [r0, #MAX_MPR4] /* for S4 */ + ldr r1, =MAX_SGPCR_CONFIG + str r1, [r0, #MAX_SGPCR0] /* for S0 */ + str r1, [r0, #MAX_SGPCR1] /* for S1 */ + str r1, [r0, #MAX_SGPCR2] /* for S2 */ + str r1, [r0, #MAX_SGPCR3] /* for S3 */ + str r1, [r0, #MAX_SGPCR4] /* for S4 */ + ldr r1, =MAX_MGPCR_CONFIG + str r1, [r0, #MAX_MGPCR0] /* for M0 */ + str r1, [r0, #MAX_MGPCR1] /* for M1 */ + str r1, [r0, #MAX_MGPCR2] /* for M2 */ + str r1, [r0, #MAX_MGPCR3] /* for M3 */ + str r1, [r0, #MAX_MGPCR4] /* for M4 */ +.endm - write32 IMX_MAX_BASE + MAX_MGPCR0, 0x0 - write32 IMX_MAX_BASE + MAX_MGPCR1, 0x0 - write32 IMX_MAX_BASE + MAX_MGPCR2, 0x0 - write32 IMX_MAX_BASE + MAX_MGPCR3, 0x0 - write32 IMX_MAX_BASE + MAX_MGPCR4, 0x0 +/* M3IF setup */ +.macro init_m3if + /* M3IF Control Register (M3IFCTL) */ + write32 IMX_M3IF_CTRL_BASE, M3IFCTL_CONFIG .endm #endif /* __ASSEMBLY__ */ diff --git u-boot-4d3c95f.orig/board/karo/tx25/lowlevel_init.S u-boot-4d3c95f/board/karo/tx25/lowlevel_init.S index 823df10..cdd9bda 100644 --- u-boot-4d3c95f.orig/board/karo/tx25/lowlevel_init.S +++ u-boot-4d3c95f/board/karo/tx25/lowlevel_init.S @@ -23,36 +23,13 @@ #include <asm/macro.h> -.macro init_aips - write32 0x43f00000, 0x77777777 - write32 0x43f00004, 0x77777777 - write32 0x43f00000, 0x77777777 - write32 0x53f00004, 0x77777777 -.endm +#define AIPS_MPR_CONFIG 0x77777777 +#define MAX_MPR_CONFIG 0x43210 +#define MAX_SGPCR_CONFIG 0x10 +#define MAX_MGPCR_CONFIG 0x0 +#define M3IFCTL_CONFIG 0x1 -.macro init_max - write32 0x43f04000, 0x43210 - write32 0x43f04100, 0x43210 - write32 0x43f04200, 0x43210 - write32 0x43f04300, 0x43210 - write32 0x43f04400, 0x43210 - - write32 0x43f04010, 0x10 - write32 0x43f04110, 0x10 - write32 0x43f04210, 0x10 - write32 0x43f04310, 0x10 - write32 0x43f04410, 0x10 - - write32 0x43f04800, 0x0 - write32 0x43f04900, 0x0 - write32 0x43f04a00, 0x0 - write32 0x43f04b00, 0x0 - write32 0x43f04c00, 0x0 -.endm - -.macro init_m3if - write32 0xb8003000, 0x1 -.endm +#include <asm/arch/macro.h> .macro init_clocks /* @@ -64,6 +41,8 @@ * 0x00600000 makes CLKO parent clk the USB clk */ write32 0x53f80064, 0x45600000 + + /* CCTL: ARM = 399 MHz, AHB = 133 MHz */ write32 0x53f80008, 0x20034000 /* diff --git u-boot-4d3c95f.orig/board/syteco/zmx25/lowlevel_init.S u-boot-4d3c95f/board/syteco/zmx25/lowlevel_init.S index 1002674..575755c 100644 --- u-boot-4d3c95f.orig/board/syteco/zmx25/lowlevel_init.S +++ u-boot-4d3c95f/board/syteco/zmx25/lowlevel_init.S @@ -25,6 +25,12 @@ */ #include <asm/macro.h> + +#define AIPS_MPR_CONFIG 0x77777777 +#define MAX_MPR_CONFIG 0x43210 +#define MAX_SGPCR_CONFIG 0x10 +#define MAX_MGPCR_CONFIG 0x0 + #include <asm/arch/macro.h> #include <asm/arch/imx-regs.h> #include <generated/asm-offsets.h>

3 9