Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 8a40fb148efa442d6526eac46a2001e4c64d28ff

Authored by Jean-Christophe PLAGNIOL-VILLARD
1 parent 507641d249
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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

move cmd_get_data_size to command.c 

add CMD_DATA_SIZE macro to enable it

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>

Showing 8 changed files with 33 additions and 38 deletions Side-by-side Diff

board/amcc/yucca/cmd_yucca.c
Diff comments   View file @ 8a40fb1
... ... @@ -33,8 +33,6 @@
33 33 static int setBootStrapClock(cmd_tbl_t *cmdtp, int incrflag,
34 34 int flag, int argc, char *argv[]);
35 35  
36   -extern int cmd_get_data_size(char* arg, int default_size);
37   -
38 36 /* ------------------------------------------------------------------------- */
39 37 int do_evb440spe(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
40 38 {
... ... @@ -127,7 +127,6 @@
127 127  
128 128 static int
129 129 mod_i2c_mem(cmd_tbl_t *cmdtp, int incrflag, int flag, int argc, char *argv[]);
130   -extern int cmd_get_data_size(char* arg, int default_size);
131 130  
132 131 /*
133 132 * Syntax:
... ... @@ -64,8 +64,6 @@
64 64  
65 65 #define op_tbl_size (sizeof(op_table)/sizeof(op_table[0]))
66 66  
67   -extern int cmd_get_data_size(char* arg, int default_size);
68   -
69 67 static long evalexp(char *s, int w)
70 68 {
71 69 long l, *p;
... ... @@ -37,35 +37,6 @@
37 37 #endif
38 38 #include <watchdog.h>
39 39  
40   -#if defined(CONFIG_CMD_MEMORY) \
41   - || defined(CONFIG_CMD_I2C) \
42   - || defined(CONFIG_CMD_ITEST) \
43   - || defined(CONFIG_CMD_PCI) \
44   - || defined(CONFIG_CMD_PORTIO)
45   -
46   -int cmd_get_data_size(char* arg, int default_size)
47   -{
48   - /* Check for a size specification .b, .w or .l.
49   - */
50   - int len = strlen(arg);
51   - if (len > 2 && arg[len-2] == '.') {
52   - switch(arg[len-1]) {
53   - case 'b':
54   - return 1;
55   - case 'w':
56   - return 2;
57   - case 'l':
58   - return 4;
59   - case 's':
60   - return -2;
61   - default:
62   - return -1;
63   - }
64   - }
65   - return default_size;
66   -}
67   -#endif
68   -
69 40 #if defined(CONFIG_CMD_MEMORY)
70 41  
71 42 #ifdef CMD_MEM_DEBUG
... ... @@ -35,8 +35,6 @@
35 35 #include <asm/io.h>
36 36 #include <pci.h>
37 37  
38   -extern int cmd_get_data_size(char* arg, int default_size);
39   -
40 38 unsigned char ShortPCIListing = 1;
41 39  
42 40 /*
... ... @@ -30,8 +30,6 @@
30 30 #include <common.h>
31 31 #include <command.h>
32 32  
33   -extern int cmd_get_data_size (char *arg, int default_size);
34   -
35 33 /* Display values from last command.
36 34 * Memory modify remembered values are different from display memory.
37 35 */
... ... @@ -654,4 +654,28 @@
654 654 }
655 655  
656 656 #endif
  657 +
  658 +#ifdef CMD_DATA_SIZE
  659 +int cmd_get_data_size(char* arg, int default_size)
  660 +{
  661 + /* Check for a size specification .b, .w or .l.
  662 + */
  663 + int len = strlen(arg);
  664 + if (len > 2 && arg[len-2] == '.') {
  665 + switch(arg[len-1]) {
  666 + case 'b':
  667 + return 1;
  668 + case 'w':
  669 + return 2;
  670 + case 'l':
  671 + return 4;
  672 + case 's':
  673 + return -2;
  674 + default:
  675 + return -1;
  676 + }
  677 + }
  678 + return default_size;
  679 +}
  680 +#endif
... ... @@ -78,6 +78,15 @@
78 78  
79 79 typedef void command_t (cmd_tbl_t *, int, int, char *[]);
80 80  
  81 +#if defined(CONFIG_CMD_MEMORY) \
  82 + || defined(CONFIG_CMD_I2C) \
  83 + || defined(CONFIG_CMD_ITEST) \
  84 + || defined(CONFIG_CMD_PCI) \
  85 + || defined(CONFIG_CMD_PORTIO)
  86 +#define CMD_DATA_SIZE
  87 +extern int cmd_get_data_size(char* arg, int default_size);
  88 +#endif
  89 +
81 90 #endif /* __ASSEMBLY__ */
82 91  
83 92 /*