diff --git a/Makefile b/Makefile index 4dfa2228b94b7d2f2182d8f1b28f23d706260ef3..8f85cae273f640add59a732b3c77cd0ba8561b2d 100644 --- a/Makefile +++ b/Makefile @@ -3314,6 +3314,9 @@ m2s-som_config : unconfig m2s-fg484-som_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexm3 m2s-fg484-som emcraft m2s +sf2plus_config : unconfig + @$(MKCONFIG) $(@:_config=) arm arm_cortexm3 m2s-fg484-som emcraft m2s + m2s-som-copy2_config : unconfig @$(MKCONFIG) $(@:_config=) arm arm_cortexm3 m2s-som emcraft m2s diff --git a/board/emcraft/m2s-fg484-som/board.c b/board/emcraft/m2s-fg484-som/board.c index 74d22274072e929f13f0c56b630691944d853198..c7fc13ca9b59ae2f77125cc36e43bbf1371f21e8 100644 --- a/board/emcraft/m2s-fg484-som/board.c +++ b/board/emcraft/m2s-fg484-som/board.c @@ -92,7 +92,7 @@ int board_init(void) int checkboard(void) { - printf("Board: M2S-FG484-SOM Rev %s, www.emcraft.com\n", + printf("Board: " CONFIG_SYS_BOARD_NAME " Rev %s\n", CONFIG_SYS_BOARD_REV_STR); return 0; } diff --git a/include/configs/m2s-fg484-som.h b/include/configs/m2s-fg484-som.h index d30748caca12a07a948cf0452b7ad786ae106f2c..6d4e820fd8cb588fc311eb27112459683c827a29 100644 --- a/include/configs/m2s-fg484-som.h +++ b/include/configs/m2s-fg484-som.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2012,2013 + * (C) Copyright 2012-2015 * Emcraft Systems, <www.emcraft.com> * Alexander Potashev <aspotashev@emcraft.com> * Vladimir Khusainov, <vlad@emcraft.com> @@ -68,7 +68,8 @@ #define CONFIG_DISPLAY_CPUINFO 1 #define CONFIG_DISPLAY_BOARDINFO 1 -#define CONFIG_SYS_BOARD_REV_STR "1A" +#define CONFIG_SYS_BOARD_NAME "M2S-FG484-SOM" +#define CONFIG_SYS_BOARD_REV_STR "1A, www.emcraft.com" /* * Monitor prompt