Commit 2d941de9 authored by Wolfgang Denk's avatar Wolfgang Denk

Prepare v2010.09-rc1

Coding style cleanup.
Signed-off-by: default avatarWolfgang Denk <wd@denx.de>
parent 8fea51a4
......@@ -22,9 +22,9 @@
#
VERSION = 2010
PATCHLEVEL = 06
PATCHLEVEL = 09
SUBLEVEL =
EXTRAVERSION =
EXTRAVERSION = -rc1
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else
......
......@@ -229,4 +229,3 @@ void at91_mci_hw_init(void)
#endif
}
#endif
......@@ -268,4 +268,3 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
}
return 0;
}
......@@ -181,4 +181,3 @@ setup_auxcr:
orrlt r0, r0, #1 << 27
.word 0xE1600070 @ SMC
bx lr
......@@ -427,4 +427,3 @@ get_36x_core_dpll_param:
get_36x_per_dpll_param:
adr r0, per_36x_dpll_param
mov pc, lr
......@@ -98,4 +98,3 @@ int arch_cpu_init(void)
set_muxconf_regs();
return 0;
}
......@@ -45,4 +45,3 @@ lowlevel_init:
*/
bl s_init
pop {ip, pc}
......@@ -51,4 +51,3 @@ int print_cpuinfo(void)
return 0;
}
......@@ -83,7 +83,7 @@ int do_loadpci (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
addr = simple_strtoul(argv[1], NULL, 16);
break;
default:
return cmd_usage(cmdtp);
return cmd_usage(cmdtp);
}
printf ("## Ready for image download ...\n");
......
......@@ -179,7 +179,7 @@ lbsc_end:
.align 4
/*------- GPIO -------*/
/* P{A,B C,D,E,F,G,L,P,Q,R}CR_D */
/* P{A,B C,D,E,F,G,L,P,Q,R}CR_D */
PXCR_D: .word 0x0000
PHCR_D: .word 0x00c0
......
......@@ -262,4 +262,3 @@ const struct pad_conf_entry wkup_padconf_array[] = {
};
#endif
......@@ -262,4 +262,3 @@ const struct pad_conf_entry wkup_padconf_array[] = {
};
#endif
......@@ -134,7 +134,7 @@ U_BOOT_CMD(
mmcinfo, 2, 0, do_mmcinfo,
"display MMC info",
"<dev num>\n"
" - device number of the device to dislay info of\n"
" - device number of the device to dislay info of\n"
""
);
......
......@@ -83,4 +83,3 @@ and the board definition files needs:
#define CONFIG_ATMEL_MCI_PORTB 1 /* Atmel XE-EK uses port B */
#define CONFIG_SYS_MMC_CD_PIN AT91_PIN_PC9
#define CONFIG_CMD_MMC 1
......@@ -456,4 +456,3 @@ int i2c_get_bus_num(void)
{
return (int) current_bus;
}
......@@ -103,4 +103,3 @@ void twl4030_power_mmc_init(void)
TWL4030_PM_RECEIVER_VMMC1_DEV_GRP,
TWL4030_PM_RECEIVER_DEV_GRP_P1);
}
......@@ -50,9 +50,9 @@
#define CONFIG_EXTRA_ENV_SETTINGS \
"slot_a_boot=setenv bootargs root=/dev/sda2 ip=off;" \
"run addhw; mw.b 400000 00 80; diskboot 400000 0:1; bootm 400000\0" \
"run addhw; mw.b 400000 00 80; diskboot 400000 0:1; bootm 400000\0" \
"slot_b_boot=setenv bootargs root=/dev/sda2 ip=off;" \
"run addhw; mw.b 400000 00 80; diskboot 400000 2:1; bootm 400000\0" \
"run addhw; mw.b 400000 00 80; diskboot 400000 2:1; bootm 400000\0" \
"nfs_boot=mw.b 400000 00 80; dhcp; run nfsargs addip addhw; bootm 400000\0" \
"fat_boot=mw.b 400000 00 80; fatload ide 2:1 400000 st.bin; run addhw; \
bootm 400000 \0" \
......@@ -105,7 +105,7 @@
* enable I2C and select the hardware/software driver
*/
#undef CONFIG_HARD_I2C /* I2C with hardware support */
#define CONFIG_SOFT_I2C /* I2C bit-banged */
#define CONFIG_SOFT_I2C /* I2C bit-banged */
#define CONFIG_SYS_I2C_SPEED 93000 /* 93 kHz is supposed to work */
#define CONFIG_SYS_I2C_SLAVE 0xFE
......@@ -250,10 +250,10 @@
* Dynamic MTD partition support
*/
#define MTDPARTS_DEFAULT "mtdparts=40000000.flash:256k(u-boot)," \
"64k(env)," \
"128k(splash)," \
"512k(etc)," \
"64k(hw-info)"
"64k(env)," \
"128k(splash)," \
"512k(etc)," \
"64k(hw-info)"
/*-----------------------------------------------------------------------
* Hardware Information Block
......@@ -507,7 +507,7 @@
#define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */
#define CONFIG_AUTOBOOT_STOP_STR "."
#define CONFIG_SILENT_CONSOLE 1
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* enble null device */
#define CONFIG_SYS_DEVICE_NULLDEV 1 /* enble null device */
#define CONFIG_VERSION_VARIABLE 1
/* pass open firmware flat tree */
......@@ -515,4 +515,3 @@
#define CONFIG_OF_BOARD_SETUP 1
#endif /* __CONFIG_H */
......@@ -73,7 +73,7 @@
#define CONFIG_BACKSIDE_L2_CACHE
#define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E
#define CONFIG_BTB /* toggle branch predition */
//#define CONFIG_DDR_ECC
/*#define CONFIG_DDR_ECC*/
#ifdef CONFIG_DDR_ECC
#define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
#define CONFIG_MEM_INIT_VALUE 0xdeadbeef
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment