# HG changeset patch # User Paul Boddie # Date 1461425210 -7200 # Node ID 134efe2c5a9f4f85c82bf79e227d06671f4dcb8e # Parent 84c928d1caf4ab91142431d04194c60e2f7dab8d Introduced convenience headers for configuration-related file selection. diff -r 84c928d1caf4 -r 134efe2c5a9f stage2/board-defs.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/stage2/board-defs.h Sat Apr 23 17:26:50 2016 +0200 @@ -0,0 +1,12 @@ +#ifndef __BOARD_DEFS_H__ +#define __BOARD_DEFS_H__ + +/* Select the board definitions according to the configuration. */ + +#ifdef CONFIG_CPU_JZ4730_MINIPC +#include "minipc.h" +#else +#include "nanonote.h" +#endif + +#endif /* __BOARD_DEFS_H__ */ diff -r 84c928d1caf4 -r 134efe2c5a9f stage2/board-display.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/stage2/board-display.h Sat Apr 23 17:26:50 2016 +0200 @@ -0,0 +1,14 @@ +#ifndef __BOARD_DISPLAY_H__ +#define __BOARD_DISPLAY_H__ + +/* Select the board display definitions according to the configuration. */ + +#ifdef CONFIG_CPU_JZ4730_MINIPC +#include "minipc_claa070vc01.h" +#include "minipc.h" +#else +#include "nanonote_gpm940b0.h" +#include "nanonote.h" +#endif + +#endif /* __BOARD_DISPLAY_H__ */ diff -r 84c928d1caf4 -r 134efe2c5a9f stage2/irq.c --- a/stage2/irq.c Sat Apr 23 17:19:29 2016 +0200 +++ b/stage2/irq.c Sat Apr 23 17:26:50 2016 +0200 @@ -17,11 +17,7 @@ * along with this program. If not, see . */ -#ifdef CONFIG_CPU_JZ4730_MINIPC -#include "minipc.h" -#else -#include "nanonote.h" -#endif +#include "board-defs.h" #include "init.h" #include "board.h" diff -r 84c928d1caf4 -r 134efe2c5a9f stage2/lcd.c --- a/stage2/lcd.c Sat Apr 23 17:19:29 2016 +0200 +++ b/stage2/lcd.c Sat Apr 23 17:26:50 2016 +0200 @@ -18,13 +18,7 @@ * along with this program. If not, see . */ -#ifdef CONFIG_CPU_JZ4730_MINIPC -#include "minipc_claa070vc01.h" -#include "minipc.h" -#else -#include "nanonote_gpm940b0.h" -#include "nanonote.h" -#endif +#include "board-display.h" #include "xburst_types.h" #include "jzlcd.h"