Commit 28f70db4 authored by Sergei Poselenov's avatar Sergei Poselenov
Browse files

RT #86616. Fixed revision number for M2S-SOM in the banner. Separate

configurations for 2A ("m2s-som_config") and 1A ("m2-som-1a_config").
parent 18a348be
......@@ -3274,8 +3274,16 @@ lpc4350-eval_config : unconfig
lpc1850-eval_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm_cortexm3 lpc1850-eval hitex lpc18xx
m2s-som-1a_config \
m2s-som_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm_cortexm3 m2s-som emcraft m2s
@mkdir -p $(obj)include
@ >$(obj)include/config.h
@[ -z "$(findstring -1a,$@)" ] || \
{ echo "#define CONFIG_SYS_BOARD_REV 0x1A" >>$(obj)include/config.h ; \
echo "...for rev 1A" ; \
}
@$(MKCONFIG) -a m2s-som arm arm_cortexm3 m2s-som emcraft m2s
m2s-fg484-som_config : unconfig
@$(MKCONFIG) $(@:_config=) arm arm_cortexm3 m2s-fg484-som emcraft m2s
......
......@@ -55,10 +55,18 @@
/*
* This is a specific revision of the board
*/
#define CONFIG_SYS_BOARD_REV 0x1A
#if !defined(CONFIG_SYS_BOARD_REV)
#define CONFIG_SYS_BOARD_REV 0x2A
#endif
#if (CONFIG_SYS_BOARD_REV!=0x1A) && (CONFIG_SYS_BOARD_REV!=0x2A)
#error CONFIG_SYS_BOARD_REV must be 1A or 2A
#endif
#if (CONFIG_SYS_BOARD_REV!=0x1A)
#error CONFIG_SYS_BOARD_REV must be 1A
#if (CONFIG_SYS_BOARD_REV==0x1A)
# define CONFIG_SYS_BOARD_REV_STR "1A"
#else
# define CONFIG_SYS_BOARD_REV_STR "2A"
#endif
/*
......@@ -67,8 +75,6 @@
#define CONFIG_DISPLAY_CPUINFO 1
#define CONFIG_DISPLAY_BOARDINFO 1
#define CONFIG_SYS_BOARD_REV_STR "A"
/*
* Monitor prompt
*/
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment