From 5891151707ee5902fe62d554c247f42865815757 Mon Sep 17 00:00:00 2001 From: Tom Rix Date: Wed, 1 Apr 2009 22:02:20 -0500 Subject: OMAP3 Fix multiline formatting in board init files. Signed-off-by: Tom Rix --- board/omap3/beagle/beagle.c | 20 ++++++++++---------- board/omap3/evm/evm.c | 16 ++++++++-------- board/omap3/overo/overo.c | 12 ++++++------ board/omap3/pandora/pandora.c | 12 ++++++------ board/omap3/zoom1/zoom1.c | 12 ++++++------ 5 files changed, 36 insertions(+), 36 deletions(-) (limited to 'board') diff --git a/board/omap3/beagle/beagle.c b/board/omap3/beagle/beagle.c index 8d6065196f..cc8e2f9a48 100644 --- a/board/omap3/beagle/beagle.c +++ b/board/omap3/beagle/beagle.c @@ -38,10 +38,10 @@ static int beagle_revision_c; -/****************************************************************************** +/* * Routine: board_init * Description: Early hardware init. - *****************************************************************************/ + */ int board_init(void) { DECLARE_GLOBAL_DATA_PTR; @@ -55,23 +55,23 @@ int board_init(void) return 0; } -/****************************************************************************** +/* * Routine: beagle_get_revision * Description: Return revision of the BeagleBoard this code is running on. * If it is a revision Ax/Bx board, this function returns 0, * on a revision C board you will get a 1. - *****************************************************************************/ + */ int beagle_get_revision(void) { return beagle_revision_c; } -/****************************************************************************** +/* * Routine: beagle_identify * Description: Detect if we are running on a Beagle revision Ax/Bx or * Cx. This can be done by GPIO_171. If this is low, we are * running on a revision C board. - *****************************************************************************/ + */ void beagle_identify(void) { gpio_t *gpio6_base = (gpio_t *)OMAP34XX_GPIO6_BASE; @@ -92,10 +92,10 @@ void beagle_identify(void) } } -/****************************************************************************** +/* * Routine: misc_init_r * Description: Configure board specific parts - *****************************************************************************/ + */ int misc_init_r(void) { gpio_t *gpio5_base = (gpio_t *)OMAP34XX_GPIO5_BASE; @@ -121,12 +121,12 @@ int misc_init_r(void) return 0; } -/****************************************************************************** +/* * Routine: set_muxconf_regs * Description: Setting up the configuration Mux registers specific to the * hardware. Many pins need to be moved from protect to primary * mode. - *****************************************************************************/ + */ void set_muxconf_regs(void) { MUX_BEAGLE(); diff --git a/board/omap3/evm/evm.c b/board/omap3/evm/evm.c index 3a27c8fe5d..c008c2e4aa 100644 --- a/board/omap3/evm/evm.c +++ b/board/omap3/evm/evm.c @@ -36,10 +36,10 @@ #include #include "evm.h" -/****************************************************************************** +/* * Routine: board_init * Description: Early hardware init. - *****************************************************************************/ + */ int board_init(void) { DECLARE_GLOBAL_DATA_PTR; @@ -53,10 +53,10 @@ int board_init(void) return 0; } -/****************************************************************************** +/* * Routine: misc_init_r * Description: Init ethernet (done here so udelay works) - *****************************************************************************/ + */ int misc_init_r(void) { @@ -73,22 +73,22 @@ int misc_init_r(void) return 0; } -/****************************************************************************** +/* * Routine: set_muxconf_regs * Description: Setting up the configuration Mux registers specific to the * hardware. Many pins need to be moved from protect to primary * mode. - *****************************************************************************/ + */ void set_muxconf_regs(void) { MUX_EVM(); } -/****************************************************************************** +/* * Routine: setup_net_chip * Description: Setting up the configuration GPMC registers specific to the * Ethernet hardware. - *****************************************************************************/ + */ static void setup_net_chip(void) { gpio_t *gpio3_base = (gpio_t *)OMAP34XX_GPIO3_BASE; diff --git a/board/omap3/overo/overo.c b/board/omap3/overo/overo.c index 37bf350e4e..809b77b642 100644 --- a/board/omap3/overo/overo.c +++ b/board/omap3/overo/overo.c @@ -35,10 +35,10 @@ #include #include "overo.h" -/****************************************************************************** +/* * Routine: board_init * Description: Early hardware init. - *****************************************************************************/ + */ int board_init(void) { DECLARE_GLOBAL_DATA_PTR; @@ -52,10 +52,10 @@ int board_init(void) return 0; } -/****************************************************************************** +/* * Routine: misc_init_r * Description: Configure board specific parts - *****************************************************************************/ + */ int misc_init_r(void) { power_init_r(); @@ -65,12 +65,12 @@ int misc_init_r(void) return 0; } -/****************************************************************************** +/* * Routine: set_muxconf_regs * Description: Setting up the configuration Mux registers specific to the * hardware. Many pins need to be moved from protect to primary * mode. - *****************************************************************************/ + */ void set_muxconf_regs(void) { MUX_OVERO(); diff --git a/board/omap3/pandora/pandora.c b/board/omap3/pandora/pandora.c index dfd51ecfcb..c2f98ead6a 100644 --- a/board/omap3/pandora/pandora.c +++ b/board/omap3/pandora/pandora.c @@ -36,10 +36,10 @@ #include #include "pandora.h" -/****************************************************************************** +/* * Routine: board_init * Description: Early hardware init. - *****************************************************************************/ + */ int board_init(void) { DECLARE_GLOBAL_DATA_PTR; @@ -53,10 +53,10 @@ int board_init(void) return 0; } -/****************************************************************************** +/* * Routine: misc_init_r * Description: Configure board specific parts - *****************************************************************************/ + */ int misc_init_r(void) { gpio_t *gpio1_base = (gpio_t *)OMAP34XX_GPIO1_BASE; @@ -82,12 +82,12 @@ int misc_init_r(void) return 0; } -/****************************************************************************** +/* * Routine: set_muxconf_regs * Description: Setting up the configuration Mux registers specific to the * hardware. Many pins need to be moved from protect to primary * mode. - *****************************************************************************/ + */ void set_muxconf_regs(void) { MUX_PANDORA(); diff --git a/board/omap3/zoom1/zoom1.c b/board/omap3/zoom1/zoom1.c index 702f732753..db4d08709f 100644 --- a/board/omap3/zoom1/zoom1.c +++ b/board/omap3/zoom1/zoom1.c @@ -37,10 +37,10 @@ #include #include "zoom1.h" -/****************************************************************************** +/* * Routine: board_init * Description: Early hardware init. - *****************************************************************************/ + */ int board_init(void) { DECLARE_GLOBAL_DATA_PTR; @@ -54,10 +54,10 @@ int board_init(void) return 0; } -/****************************************************************************** +/* * Routine: misc_init_r * Description: Configure zoom board specific configurations - *****************************************************************************/ + */ int misc_init_r(void) { power_init_r(); @@ -65,12 +65,12 @@ int misc_init_r(void) return 0; } -/****************************************************************************** +/* * Routine: set_muxconf_regs * Description: Setting up the configuration Mux registers specific to the * hardware. Many pins need to be moved from protect to primary * mode. - *****************************************************************************/ + */ void set_muxconf_regs(void) { /* platform specific muxes */ -- cgit From ab0689c316c9b2ee33f4de1c50263b64e539f12a Mon Sep 17 00:00:00 2001 From: Kyungmin Park Date: Wed, 26 Nov 2008 10:18:13 +0900 Subject: Move machine specific code to board at s3c64xx (v2) Move machine specific code to smdk6400. Some board use OneNAND instead of NAND. Some register MP0_CS_CFG[5:0] are controled by both h/w and s/w. So it's better to use macro instead of hard-coded value. Signed-off-by: Kyungmin Park --- board/samsung/smdk6400/lowlevel_init.S | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'board') diff --git a/board/samsung/smdk6400/lowlevel_init.S b/board/samsung/smdk6400/lowlevel_init.S index e0119a771c..47f72f6132 100644 --- a/board/samsung/smdk6400/lowlevel_init.S +++ b/board/samsung/smdk6400/lowlevel_init.S @@ -104,6 +104,13 @@ lowlevel_init: bl nand_asm_init #endif + /* Memory subsystem address 0x7e00f120 */ + ldr r0, =ELFIN_MEM_SYS_CFG + + /* Xm0CSn2 = NFCON CS0, Xm0CSn3 = NFCON CS1 */ + mov r1, #S3C64XX_MEM_SYS_CFG_NAND + str r1, [r0] + bl mem_ctrl_asm_init /* Wakeup support. Don't know if it's going to be used, untested. */ -- cgit From b3acb6cd4059dfb29a5e99095d802717f53ff784 Mon Sep 17 00:00:00 2001 From: Jean-Christophe PLAGNIOL-VILLARD Date: Sun, 5 Apr 2009 13:06:31 +0200 Subject: arm: clean cache management unify arm cache management except for non standard cache as ARM7TDMI Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD --- board/armltd/integratorap/split_by_variant.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'board') diff --git a/board/armltd/integratorap/split_by_variant.sh b/board/armltd/integratorap/split_by_variant.sh index 51dc53f1bd..2c9fe2e519 100755 --- a/board/armltd/integratorap/split_by_variant.sh +++ b/board/armltd/integratorap/split_by_variant.sh @@ -84,8 +84,8 @@ else esac fi -if [ "$cpu" = "arm_intcm" ] -then +case "$cpu" in + arm_intcm) echo "/* Core module undefined/not ported */" >> tmp.fil echo "#define CONFIG_ARM_INTCM 1" >> tmp.fil echo -n "#undef CONFIG_CM_MULTIPLE_SSRAM" >> tmp.fil @@ -102,7 +102,19 @@ then echo "initialization reg */" >> tmp.fil echo -n "#undef CONFIG_CM_TCRAM " >> tmp.fil echo " /* CM may not have TCRAM */" >> tmp.fil -fi + echo -n " /* May not be processor " >> tmp.fil + echo "without cache support */" >> tmp.fil + echo "#define CONFIG_SYS_NO_ICACHE 1" >> tmp.fil + echo "#define CONFIG_SYS_NO_DCACHE 1" >> tmp.fil + ;; + + arm720t) + echo -n " /* May not be processor " >> tmp.fil + echo "without cache support */" >> tmp.fil + echo "#define CONFIG_SYS_NO_ICACHE 1" >> tmp.fil + echo "#define CONFIG_SYS_NO_DCACHE 1" >> tmp.fil + ;; +esac mkdir -p ${obj}include mkdir -p ${obj}board/armltd/integratorap -- cgit From 1c397508c836dfcb01fb2471c71de0727051f117 Mon Sep 17 00:00:00 2001 From: Dirk Behme Date: Mon, 30 Mar 2009 21:15:23 +0200 Subject: OMAP3: Update Overo pin mux for new expansion board A new Overo expansion board uses GPIO 14, 21, 22 and 23 for LED's and switches. This patch changes the pinmux configuration for those pins. They were previously set up for unused MMC3_DAT4-7. Signed-off-by: Steve Sakoman Signed-off-by: Dirk Behme --- board/omap3/overo/overo.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'board') diff --git a/board/omap3/overo/overo.h b/board/omap3/overo/overo.h index 71de3f10d3..e8ccc1d2e6 100644 --- a/board/omap3/overo/overo.h +++ b/board/omap3/overo/overo.h @@ -185,6 +185,7 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(CSI2_DX0), (IEN | PTD | DIS | M0)) /*CSI2_DX0*/\ MUX_VAL(CP(CSI2_DY0), (IEN | PTD | DIS | M0)) /*CSI2_DY0*/\ MUX_VAL(CP(CSI2_DX1), (IEN | PTD | EN | M4)) /*GPIO_114*/\ + /* - PEN_DOWN*/\ MUX_VAL(CP(CSI2_DY1), (IEN | PTU | EN | M4)) /*GPIO_115*/\ /*Audio Interface */\ MUX_VAL(CP(MCBSP2_FSX), (IEN | PTD | DIS | M0)) /*McBSP2_FSX*/\ @@ -295,7 +296,7 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(SYS_CLKOUT2), (IEN | PTU | EN | M4)) /*GPIO_186*/\ MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | EN | M2)) /*MMC3_CLK*/\ MUX_VAL(CP(ETK_CTL_ES2), (IEN | PTU | EN | M2)) /*MMC3_CMD*/\ - MUX_VAL(CP(ETK_D0_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT4*/\ + MUX_VAL(CP(ETK_D0_ES2), (IEN | PTU | EN | M4)) /*GPIO_14*/\ MUX_VAL(CP(ETK_D1_ES2), (IEN | PTD | EN | M4)) /*GPIO_15 - X_GATE*/\ MUX_VAL(CP(ETK_D2_ES2), (IEN | PTU | EN | M4)) /*GPIO_16*/\ /* - W2W_NRESET*/\ @@ -303,9 +304,9 @@ const omap3_sysinfo sysinfo = { MUX_VAL(CP(ETK_D4_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT0*/\ MUX_VAL(CP(ETK_D5_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT1*/\ MUX_VAL(CP(ETK_D6_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT2*/\ - MUX_VAL(CP(ETK_D7_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT7*/\ - MUX_VAL(CP(ETK_D8_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT6*/\ - MUX_VAL(CP(ETK_D9_ES2), (IEN | PTU | EN | M2)) /*MMC3_DAT5*/\ + MUX_VAL(CP(ETK_D7_ES2), (IEN | PTU | EN | M4)) /*GPIO_21*/\ + MUX_VAL(CP(ETK_D8_ES2), (IEN | PTU | EN | M4)) /*GPIO_22*/\ + MUX_VAL(CP(ETK_D9_ES2), (IEN | PTU | EN | M4)) /*GPIO_23*/\ MUX_VAL(CP(ETK_D10_ES2), (IDIS | PTD | DIS | M3)) /*HSUSB2_CLK*/\ MUX_VAL(CP(ETK_D11_ES2), (IDIS | PTD | DIS | M3)) /*HSUSB2_STP*/\ MUX_VAL(CP(ETK_D12_ES2), (IEN | PTD | DIS | M3)) /*HSUSB2_DIR*/\ -- cgit