Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 51926d5ee0be029fb45f10f42756df97279f8ad3

Authored by Marek Vasut
Committed by Tom Rini
1 parent 5368c55d4c
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

COMMON: Use __stringify() instead of rest of implementations 

Fix up the rest of implementations of __stringify().

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Wolfgang Denk <wd@denx.de>

Showing 4 changed files with 12 additions and 19 deletions Side-by-side Diff

board/logicpd/zoom2/zoom2_serial.h
Diff comments   View file @ 51926d5
... ... @@ -22,6 +22,8 @@
22 22 #ifndef ZOOM2_SERIAL_H
23 23 #define ZOOM2_SERIAL_H
24 24  
  25 +#include <linux/stringify.h>
  26 +
25 27 extern int zoom2_debug_board_connected (void);
26 28  
27 29 #define SERIAL_TL16CP754C_BASE 0x10000000 /* Zoom2 Serial chip address */
... ... @@ -31,9 +33,6 @@
31 33 #define QUAD_BASE_2 (SERIAL_TL16CP754C_BASE + 0x200)
32 34 #define QUAD_BASE_3 (SERIAL_TL16CP754C_BASE + 0x300)
33 35  
34   -#define S(a) #a
35   -#define N(a) S(quad##a)
36   -
37 36 #define QUAD_INIT(n) \
38 37 int quad_init_##n(void) \
39 38 { \
... ... @@ -61,7 +60,7 @@
61 60 } \
62 61 struct serial_device zoom2_serial_device##n = \
63 62 { \
64   - N(n), \
  63 + __stringify(n), \
65 64 quad_init_##n, \
66 65 NULL, \
67 66 quad_setbrg_##n, \
include/configs/astro_mcf5373l.h
Diff comments   View file @ 51926d5
... ... @@ -33,6 +33,8 @@
33 33 #ifndef _CONFIG_ASTRO_MCF5373L_H
34 34 #define _CONFIG_ASTRO_MCF5373L_H
35 35  
  36 +#include <linux/stringify.h>
  37 +
36 38 /*
37 39 * set the card type to actually compile for; either of
38 40 * the possibilities listed below has to be used!
39 41  
... ... @@ -209,12 +211,9 @@
209 211 * u-boot: 'set' command
210 212 */
211 213  
212   -#define _QUOTEME(x) #x
213   -#define QUOTEME(x) _QUOTEME(x)
214   -
215 214 #define CONFIG_EXTRA_ENV_SETTINGS \
216 215 "loaderversion=11\0" \
217   - "card_id="QUOTEME(ASTRO_ID)"(ASTRO_ID)"\0" \" \
  216 + "card_id="__stringify(ASTRO_ID)"(ASTRO_ID)"\0" \" \
218 217 "alterafile=0\0" \
219 218 "xilinxfile=0\0" \
220 219 "xilinxload=imxtract 0x540000 $xilinxfile 0x41000000&&"\
include/configs/tegra20-common.h
Diff comments   View file @ 51926d5
... ... @@ -24,16 +24,9 @@
24 24 #ifndef __TEGRA20_COMMON_H
25 25 #define __TEGRA20_COMMON_H
26 26 #include <asm/sizes.h>
  27 +#include <linux/stringify.h>
27 28  
28 29 /*
29   - * QUOTE(m) will evaluate to a string version of the value of the macro m
30   - * passed in. The extra level of indirection here is to first evaluate the
31   - * macro m before applying the quoting operator.
32   - */
33   -#define QUOTE_(m) #m
34   -#define QUOTE(m) QUOTE_(m)
35   -
36   -/*
37 30 * High Level Configuration Options
38 31 */
39 32 #define CONFIG_ARMCORTEXA9 /* This is an ARM V7 CPU core */
... ... @@ -58,7 +51,8 @@
58 51 #define TEGRA_LP0_ADDR 0x1C406000
59 52 #define TEGRA_LP0_SIZE 0x2000
60 53 #define TEGRA_LP0_VEC \
61   - "lp0_vec=" QUOTE(TEGRA_LP0_SIZE) "@" QUOTE(TEGRA_LP0_ADDR) " "
  54 + "lp0_vec=" __stringify(TEGRA_LP0_SIZE) \
  55 + "@" __stringify(TEGRA_LP0_ADDR) " "
62 56 #else
63 57 #define TEGRA_LP0_VEC
64 58 #endif
... ... @@ -24,6 +24,8 @@
24 24 #ifndef __NIOS2_H__
25 25 #define __NIOS2_H__
26 26  
  27 +#include <linux/stringify.h>
  28 +
27 29 /*------------------------------------------------------------------------
28 30 * Control registers -- use with wrctl() & rdctl()
29 31 *----------------------------------------------------------------------*/
30 32  
... ... @@ -36,11 +38,10 @@
36 38 /*------------------------------------------------------------------------
37 39 * Access to control regs
38 40 *----------------------------------------------------------------------*/
39   -#define _str_(x) #x
40 41  
41 42 #define rdctl(reg)\
42 43 ({unsigned int val;\
43   - asm volatile( "rdctl %0, ctl" _str_(reg)\
  44 + asm volatile("rdctl %0, ctl" __stringify(reg) \
44 45 : "=r" (val) ); val;})
45 46  
46 47 #define wrctl(reg,val)\