Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 2d941de9d5c7ba00dc19787dfa0aac2949fd00fb

Authored by Wolfgang Denk
1 parent 8fea51a4ac
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Prepare v2010.09-rc1 

Coding style cleanup.

Signed-off-by: Wolfgang Denk <wd@denx.de>

Showing 6 changed files with 14 additions and 27 deletions Side-by-side Diff

... ... @@ -22,9 +22,9 @@
22 22 #
23 23  
24 24 VERSION = 2010
25   -PATCHLEVEL = 06
  25 +PATCHLEVEL = 09
26 26 SUBLEVEL =
27   -EXTRAVERSION =
  27 +EXTRAVERSION = -rc1
28 28 ifneq "$(SUBLEVEL)" ""
29 29 U_BOOT_VERSION = $(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
30 30 else
board/pn62/cmd_pn62.c
Diff comments   View file @ 2d941de
... ... @@ -83,7 +83,7 @@
83 83 addr = simple_strtoul(argv[1], NULL, 16);
84 84 break;
85 85 default:
86   - return cmd_usage(cmdtp);
  86 + return cmd_usage(cmdtp);
87 87 }
88 88  
89 89 printf ("## Ready for image download ...\n");
board/renesas/sh7785lcr/lowlevel_init.S
Diff comments   View file @ 2d941de
... ... @@ -179,7 +179,7 @@
179 179 .align 4
180 180  
181 181 /*------- GPIO -------*/
182   -/* P{A,B C,D,E,F,G,L,P,Q,R}CR_D */
  182 +/* P{A,B C,D,E,F,G,L,P,Q,R}CR_D */
183 183 PXCR_D: .word 0x0000
184 184  
185 185 PHCR_D: .word 0x00c0
... ... @@ -134,7 +134,7 @@
134 134 mmcinfo, 2, 0, do_mmcinfo,
135 135 "display MMC info",
136 136 "<dev num>\n"
137   - " - device number of the device to dislay info of\n"
  137 + " - device number of the device to dislay info of\n"
138 138 ""
139 139 );
140 140  
include/configs/KUP4K.h
Diff comments   View file @ 2d941de
... ... @@ -50,9 +50,9 @@
50 50  
51 51 #define CONFIG_EXTRA_ENV_SETTINGS \
52 52 "slot_a_boot=setenv bootargs root=/dev/sda2 ip=off;" \
53   - "run addhw; mw.b 400000 00 80; diskboot 400000 0:1; bootm 400000\0" \
  53 + "run addhw; mw.b 400000 00 80; diskboot 400000 0:1; bootm 400000\0" \
54 54 "slot_b_boot=setenv bootargs root=/dev/sda2 ip=off;" \
55   - "run addhw; mw.b 400000 00 80; diskboot 400000 2:1; bootm 400000\0" \
  55 + "run addhw; mw.b 400000 00 80; diskboot 400000 2:1; bootm 400000\0" \
56 56 "nfs_boot=mw.b 400000 00 80; dhcp; run nfsargs addip addhw; bootm 400000\0" \
57 57 "fat_boot=mw.b 400000 00 80; fatload ide 2:1 400000 st.bin; run addhw; \
58 58 bootm 400000 \0" \
... ... @@ -105,7 +105,7 @@
105 105 * enable I2C and select the hardware/software driver
106 106 */
107 107 #undef CONFIG_HARD_I2C /* I2C with hardware support */
108   -#define CONFIG_SOFT_I2C /* I2C bit-banged */
  108 +#define CONFIG_SOFT_I2C /* I2C bit-banged */
109 109  
110 110 #define CONFIG_SYS_I2C_SPEED 93000 /* 93 kHz is supposed to work */
111 111 #define CONFIG_SYS_I2C_SLAVE 0xFE
... ... @@ -250,10 +250,10 @@
250 250 * Dynamic MTD partition support
251 251 */
252 252 #define MTDPARTS_DEFAULT "mtdparts=40000000.flash:256k(u-boot)," \
253   - "64k(env)," \
254   - "128k(splash)," \
255   - "512k(etc)," \
256   - "64k(hw-info)"
  253 + "64k(env)," \
  254 + "128k(splash)," \
  255 + "512k(etc)," \
  256 + "64k(hw-info)"
257 257  
258 258 /*-----------------------------------------------------------------------
259 259 * Hardware Information Block
... ... @@ -507,7 +507,7 @@
507 507 #define CONFIG_AUTOBOOT_KEYED /* use key strings to stop autoboot */
508 508 #define CONFIG_AUTOBOOT_STOP_STR "."
509 509 #define CONFIG_SILENT_CONSOLE 1
510   -#define CONFIG_SYS_DEVICE_NULLDEV 1 /* enble null device */
  510 +#define CONFIG_SYS_DEVICE_NULLDEV 1 /* enble null device */
511 511 #define CONFIG_VERSION_VARIABLE 1
512 512  
513 513 /* pass open firmware flat tree */
include/configs/corenet_ds.h
Diff comments   View file @ 2d941de
... ... @@ -73,7 +73,7 @@
73 73 #define CONFIG_BACKSIDE_L2_CACHE
74 74 #define CONFIG_SYS_INIT_L2CSR0 L2CSR0_L2E
75 75 #define CONFIG_BTB /* toggle branch predition */
76   -//#define CONFIG_DDR_ECC
  76 +/*#define CONFIG_DDR_ECC*/
77 77 #ifdef CONFIG_DDR_ECC
78 78 #define CONFIG_ECC_INIT_VIA_DDRCONTROLLER
79 79 #define CONFIG_MEM_INIT_VALUE 0xdeadbeef