summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile4
-rw-r--r--arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c1
-rw-r--r--arch/arm/cpu/arm926ejs/at91/eflash.c1
-rw-r--r--arch/arm/cpu/armv7/omap3/cache.S1
-rw-r--r--arch/arm/cpu/armv7/omap3/lowlevel_init.S1
-rw-r--r--arch/arm/cpu/armv7/omap4/board.c1
-rw-r--r--arch/arm/cpu/armv7/omap4/lowlevel_init.S1
-rw-r--r--arch/arm/cpu/armv7/omap4/sys_info.c1
-rw-r--r--board/pn62/cmd_pn62.c2
-rw-r--r--board/renesas/sh7785lcr/lowlevel_init.S2
-rw-r--r--board/ti/panda/panda.h1
-rw-r--r--board/ti/sdp4430/sdp.h1
-rw-r--r--common/cmd_mmc.c2
-rw-r--r--doc/README.atmel_mci1
-rw-r--r--drivers/i2c/omap24xx_i2c.c1
-rw-r--r--drivers/power/twl4030.c1
-rw-r--r--include/configs/KUP4K.h17
-rw-r--r--include/configs/corenet_ds.h2
18 files changed, 14 insertions, 27 deletions
diff --git a/Makefile b/Makefile
index 44cd35754..6ffbb5ab7 100644
--- a/Makefile
+++ b/Makefile
@@ -22,9 +22,9 @@
#
VERSION = 2010
-PATCHLEVEL = 06
+PATCHLEVEL = 09
SUBLEVEL =
-EXTRAVERSION =
+EXTRAVERSION = -rc1
ifneq "$(SUBLEVEL)" ""
U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
else
diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c
index 87b04426b..f699f4d48 100644
--- a/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c
+++ b/arch/arm/cpu/arm926ejs/at91/at91sam9260_devices.c
@@ -229,4 +229,3 @@ void at91_mci_hw_init(void)
#endif
}
#endif
-
diff --git a/arch/arm/cpu/arm926ejs/at91/eflash.c b/arch/arm/cpu/arm926ejs/at91/eflash.c
index 2e851dbd2..938c3b1f0 100644
--- a/arch/arm/cpu/arm926ejs/at91/eflash.c
+++ b/arch/arm/cpu/arm926ejs/at91/eflash.c
@@ -268,4 +268,3 @@ int write_buff (flash_info_t *info, uchar *src, ulong addr, ulong cnt)
}
return 0;
}
-
diff --git a/arch/arm/cpu/armv7/omap3/cache.S b/arch/arm/cpu/armv7/omap3/cache.S
index 24e950f38..fdc1666fe 100644
--- a/arch/arm/cpu/armv7/omap3/cache.S
+++ b/arch/arm/cpu/armv7/omap3/cache.S
@@ -181,4 +181,3 @@ setup_auxcr:
orrlt r0, r0, #1 << 27
.word 0xE1600070 @ SMC
bx lr
-
diff --git a/arch/arm/cpu/armv7/omap3/lowlevel_init.S b/arch/arm/cpu/armv7/omap3/lowlevel_init.S
index 91c6dbcc0..935bbb6bc 100644
--- a/arch/arm/cpu/armv7/omap3/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap3/lowlevel_init.S
@@ -427,4 +427,3 @@ get_36x_core_dpll_param:
get_36x_per_dpll_param:
adr r0, per_36x_dpll_param
mov pc, lr
-
diff --git a/arch/arm/cpu/armv7/omap4/board.c b/arch/arm/cpu/armv7/omap4/board.c
index 2e80d1fbf..195be6eea 100644
--- a/arch/arm/cpu/armv7/omap4/board.c
+++ b/arch/arm/cpu/armv7/omap4/board.c
@@ -98,4 +98,3 @@ int arch_cpu_init(void)
set_muxconf_regs();
return 0;
}
-
diff --git a/arch/arm/cpu/armv7/omap4/lowlevel_init.S b/arch/arm/cpu/armv7/omap4/lowlevel_init.S
index 9a181eba9..026dfa46e 100644
--- a/arch/arm/cpu/armv7/omap4/lowlevel_init.S
+++ b/arch/arm/cpu/armv7/omap4/lowlevel_init.S
@@ -45,4 +45,3 @@ lowlevel_init:
*/
bl s_init
pop {ip, pc}
-
diff --git a/arch/arm/cpu/armv7/omap4/sys_info.c b/arch/arm/cpu/armv7/omap4/sys_info.c
index 3b7319183..b9e57659f 100644
--- a/arch/arm/cpu/armv7/omap4/sys_info.c
+++ b/arch/arm/cpu/armv7/omap4/sys_info.c
@@ -51,4 +51,3 @@ int print_cpuinfo(void)
return 0;
}
-
diff --git a/board/pn62/cmd_pn62.c b/board/pn62/cmd_pn62.c
index 692160cea..58c680b7f 100644
--- a/board/pn62/cmd_pn62.c
+++ b/board/pn62/cmd_pn62.c
@@ -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");
diff --git a/board/renesas/sh7785lcr/lowlevel_init.S b/board/renesas/sh7785lcr/lowlevel_init.S
index 86f67837f..24a0ecdf8 100644
--- a/board/renesas/sh7785lcr/lowlevel_init.S
+++ b/board/renesas/sh7785lcr/lowlevel_init.S
@@ -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
diff --git a/board/ti/panda/panda.h b/board/ti/panda/panda.h
index 877ae5f95..eb1f021da 100644
--- a/board/ti/panda/panda.h
+++ b/board/ti/panda/panda.h
@@ -262,4 +262,3 @@ const struct pad_conf_entry wkup_padconf_array[] = {
};
#endif
-
diff --git a/board/ti/sdp4430/sdp.h b/board/ti/sdp4430/sdp.h
index 803e3d307..bf41067ca 100644
--- a/board/ti/sdp4430/sdp.h
+++ b/board/ti/sdp4430/sdp.h
@@ -262,4 +262,3 @@ const struct pad_conf_entry wkup_padconf_array[] = {
};
#endif
-
diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index c0b30d8b8..2b14a42dc 100644
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -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"
""
);
diff --git a/doc/README.atmel_mci b/doc/README.atmel_mci
index 18b1bdf7e..dee0cf0a9 100644
--- a/doc/README.atmel_mci
+++ b/doc/README.atmel_mci
@@ -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
-
diff --git a/drivers/i2c/omap24xx_i2c.c b/drivers/i2c/omap24xx_i2c.c
index 7c98f150d..a7c4e69a6 100644
--- a/drivers/i2c/omap24xx_i2c.c
+++ b/drivers/i2c/omap24xx_i2c.c
@@ -456,4 +456,3 @@ int i2c_get_bus_num(void)
{
return (int) current_bus;
}
-
diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
index 1a5408959..5a7323a71 100644
--- a/drivers/power/twl4030.c
+++ b/drivers/power/twl4030.c
@@ -103,4 +103,3 @@ void twl4030_power_mmc_init(void)
TWL4030_PM_RECEIVER_VMMC1_DEV_GRP,
TWL4030_PM_RECEIVER_DEV_GRP_P1);
}
-
diff --git a/include/configs/KUP4K.h b/include/configs/KUP4K.h
index 14d412d18..c6978c335 100644
--- a/include/configs/KUP4K.h
+++ b/include/configs/KUP4K.h
@@ -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 */
-
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 3dcee85d8..d223a4d73 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.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
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2025-10-31 05:54:20 +0000