Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ae3af05ec986a8ac66dadb5eafe13db2d4a02c5c

Authored by wdenk
1 parent 9374fa287b
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

Update for TQM board defaults: 

disable clocks_in_mhz, enable boot count limit

Showing 13 changed files with 44 additions and 43 deletions Side-by-side Diff

... ... @@ -2,6 +2,9 @@
2 2 Changes for U-Boot 0.4.5:
3 3 ======================================================================
4 4  
  5 +* Update for TQM board defaults:
  6 + disable clocks_in_mhz, enable boot count limit
  7 +
5 8 * Removed tools/gdb from "make all" target. Added make target "gdbtools"
6 9 in toplevel directory instead. Removed astest.c from tools/gdb because
7 10 it is no longer relevant.
... ... @@ -417,6 +417,12 @@
417 417 TQM862L_config \
418 418 TQM862L_66MHz_config \
419 419 TQM862L_80MHz_config \
  420 +TQM823M_config \
  421 +TQM823M_66MHz_config \
  422 +TQM823M_80MHz_config \
  423 +TQM850M_config \
  424 +TQM850M_66MHz_config \
  425 +TQM850M_80MHz_config \
420 426 TQM855M_config \
421 427 TQM855M_66MHz_config \
422 428 TQM855M_80MHz_config \
include/configs/TQM823L.h
Diff comments   View file @ ae3af05
... ... @@ -44,14 +44,11 @@
44 44 #undef CONFIG_8xx_CONS_SMC2
45 45 #undef CONFIG_8xx_CONS_NONE
46 46 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */
47   -#if 0
48   -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */
49   -#else
50   -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
51   -#endif
52 47  
53   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
  48 +#define CONFIG_BOOTCOUNT_LIMIT
54 49  
  50 +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
  51 +
55 52 #define CONFIG_BOARD_TYPES 1 /* support board types */
56 53  
57 54 #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
... ... @@ -59,6 +56,7 @@
59 56 #undef CONFIG_BOOTARGS
60 57  
61 58 #define CONFIG_EXTRA_ENV_SETTINGS \
  59 + "netdev=eth0\0" \
62 60 "nfsargs=setenv bootargs root=/dev/nfs rw " \
63 61 "nfsroot=$(serverip):$(rootpath)\0" \
64 62 "ramargs=setenv bootargs root=/dev/ram rw\0" \
include/configs/TQM823M.h
Diff comments   View file @ ae3af05
... ... @@ -44,13 +44,10 @@
44 44 #undef CONFIG_8xx_CONS_SMC2
45 45 #undef CONFIG_8xx_CONS_NONE
46 46 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */
47   -#if 0
48   -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */
49   -#else
50   -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
51   -#endif
52 47  
53   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
  48 +#define CONFIG_BOOTCOUNT_LIMIT
  49 +
  50 +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
54 51  
55 52 #define CONFIG_BOARD_TYPES 1 /* support board types */
56 53  
include/configs/TQM8260.h
Diff comments   View file @ ae3af05
... ... @@ -56,13 +56,20 @@
56 56  
57 57 #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
58 58  
59   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
  59 +#define CONFIG_BOOTCOUNT_LIMIT
60 60  
  61 +#if defined(CONFIG_CONS_NONE) || defined(CONFIG_CONS_USE_EXTC)
  62 +#define CONFIG_BAUDRATE 230400
  63 +#else
  64 +#define CONFIG_BAUDRATE 9600
  65 +#endif
  66 +
61 67 #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
62 68  
63 69 #undef CONFIG_BOOTARGS
64 70  
65 71 #define CONFIG_EXTRA_ENV_SETTINGS \
  72 + "netdev=eth0\0" \
66 73 "nfsargs=setenv bootargs root=/dev/nfs rw " \
67 74 "nfsroot=$(serverip):$(rootpath)\0" \
68 75 "ramargs=setenv bootargs root=/dev/ram rw\0" \
... ... @@ -203,12 +210,6 @@
203 210 # define CONFIG_8260_CLKIN 83333000 /* in Hz */
204 211 # endif
205 212 #endif /* CONFIG_MPC8255 */
206   -
207   -#if defined(CONFIG_CONS_NONE) || defined(CONFIG_CONS_USE_EXTC)
208   -#define CONFIG_BAUDRATE 230400
209   -#else
210   -#define CONFIG_BAUDRATE 9600
211   -#endif
212 213  
213 214 #define CONFIG_LOADS_ECHO 1 /* echo on for serial download */
214 215 #undef CFG_LOADS_BAUD_CHANGE /* don't allow baudrate change */
include/configs/TQM850L.h
Diff comments   View file @ ae3af05
... ... @@ -40,14 +40,11 @@
40 40 #undef CONFIG_8xx_CONS_SMC2
41 41 #undef CONFIG_8xx_CONS_NONE
42 42 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */
43   -#if 0
44   -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */
45   -#else
46   -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
47   -#endif
48 43  
49   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
  44 +#define CONFIG_BOOTCOUNT_LIMIT
50 45  
  46 +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
  47 +
51 48 #define CONFIG_BOARD_TYPES 1 /* support board types */
52 49  
53 50 #define CONFIG_PREBOOT "echo;echo Type \"run flash_nfs\" to mount root filesystem over NFS;echo"
... ... @@ -55,6 +52,7 @@
55 52 #undef CONFIG_BOOTARGS
56 53  
57 54 #define CONFIG_EXTRA_ENV_SETTINGS \
  55 + "netdev=eth0\0" \
58 56 "nfsargs=setenv bootargs root=/dev/nfs rw " \
59 57 "nfsroot=$(serverip):$(rootpath)\0" \
60 58 "ramargs=setenv bootargs root=/dev/ram rw\0" \
include/configs/TQM850M.h
Diff comments   View file @ ae3af05
... ... @@ -40,13 +40,8 @@
40 40 #undef CONFIG_8xx_CONS_SMC2
41 41 #undef CONFIG_8xx_CONS_NONE
42 42 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */
43   -#if 0
44   -#define CONFIG_BOOTDELAY -1 /* autoboot disabled */
45   -#else
46   -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
47   -#endif
48 43  
49   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
  44 +#define CONFIG_BOOTCOUNT_LIMIT
50 45  
51 46 #define CONFIG_BOARD_TYPES 1 /* support board types */
52 47  
include/configs/TQM855L.h
Diff comments   View file @ ae3af05
... ... @@ -42,10 +42,10 @@
42 42  
43 43 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */
44 44  
  45 +#define CONFIG_BOOTCOUNT_LIMIT
  46 +
45 47 #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
46 48  
47   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
48   -
49 49 #define CONFIG_BOARD_TYPES 1 /* support board types */
50 50  
51 51 #define CONFIG_PREBOOT "echo;" \
... ... @@ -55,6 +55,7 @@
55 55 #undef CONFIG_BOOTARGS
56 56  
57 57 #define CONFIG_EXTRA_ENV_SETTINGS \
  58 + "netdev=eth0\0" \
58 59 "nfsargs=setenv bootargs root=/dev/nfs rw " \
59 60 "nfsroot=$(serverip):$(rootpath)\0" \
60 61 "ramargs=setenv bootargs root=/dev/ram rw\0" \
include/configs/TQM855M.h
Diff comments   View file @ ae3af05
... ... @@ -42,9 +42,9 @@
42 42  
43 43 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */
44 44  
45   -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
  45 +#define CONFIG_BOOTCOUNT_LIMIT
46 46  
47   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
  47 +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
48 48  
49 49 #define CONFIG_BOARD_TYPES 1 /* support board types */
50 50  
include/configs/TQM860L.h
Diff comments   View file @ ae3af05
... ... @@ -42,10 +42,10 @@
42 42  
43 43 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */
44 44  
  45 +#define CONFIG_BOOTCOUNT_LIMIT
  46 +
45 47 #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
46 48  
47   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
48   -
49 49 #define CONFIG_BOARD_TYPES 1 /* support board types */
50 50  
51 51 #define CONFIG_PREBOOT "echo;" \
... ... @@ -55,6 +55,7 @@
55 55 #undef CONFIG_BOOTARGS
56 56  
57 57 #define CONFIG_EXTRA_ENV_SETTINGS \
  58 + "netdev=eth0\0" \
58 59 "nfsargs=setenv bootargs root=/dev/nfs rw " \
59 60 "nfsroot=$(serverip):$(rootpath)\0" \
60 61 "ramargs=setenv bootargs root=/dev/ram rw\0" \
include/configs/TQM860M.h
Diff comments   View file @ ae3af05
... ... @@ -42,9 +42,9 @@
42 42  
43 43 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */
44 44  
45   -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
  45 +#define CONFIG_BOOTCOUNT_LIMIT
46 46  
47   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
  47 +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
48 48  
49 49 #define CONFIG_BOARD_TYPES 1 /* support board types */
50 50  
include/configs/TQM862L.h
Diff comments   View file @ ae3af05
... ... @@ -45,10 +45,10 @@
45 45  
46 46 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */
47 47  
  48 +#define CONFIG_BOOTCOUNT_LIMIT
  49 +
48 50 #define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
49 51  
50   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
51   -
52 52 #define CONFIG_BOARD_TYPES 1 /* support board types */
53 53  
54 54 #define CONFIG_PREBOOT "echo;" \
... ... @@ -58,6 +58,7 @@
58 58 #undef CONFIG_BOOTARGS
59 59  
60 60 #define CONFIG_EXTRA_ENV_SETTINGS \
  61 + "netdev=eth0\0" \
61 62 "nfsargs=setenv bootargs root=/dev/nfs rw " \
62 63 "nfsroot=$(serverip):$(rootpath)\0" \
63 64 "ramargs=setenv bootargs root=/dev/ram rw\0" \
include/configs/TQM862M.h
Diff comments   View file @ ae3af05
... ... @@ -45,9 +45,9 @@
45 45  
46 46 #define CONFIG_BAUDRATE 115200 /* console baudrate = 115kbps */
47 47  
48   -#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
  48 +#define CONFIG_BOOTCOUNT_LIMIT
49 49  
50   -#define CONFIG_CLOCKS_IN_MHZ 1 /* clocks passsed to Linux in MHz */
  50 +#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
51 51  
52 52 #define CONFIG_BOARD_TYPES 1 /* support board types */
53 53