# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1433877999 -7200
# Node ID 25ad44524ef534c84d8b90cce3dddb858b903c01
# Parent  83787736d5c2ff18771cf8e8b1b5389bc865a1d9
Attempt to decouple generic code from the NanoNote definitions.

diff -r 83787736d5c2 -r 25ad44524ef5 stage2/jzlcd.c
--- a/stage2/jzlcd.c	Tue Jun 09 21:10:40 2015 +0200
+++ b/stage2/jzlcd.c	Tue Jun 09 21:26:39 2015 +0200
@@ -20,7 +20,7 @@
  * MA 02111-1307 USA
  */
 
-#include "nanonote_gpm940b0.h"
+#include "jz4740_lcd.h"
 #include "sdram.h"
 #include "jzlcd.h"
 #include "board.h"
@@ -30,6 +30,7 @@
 #define align8(n) (n)=((((n)+7)>>3)<<3)
 
 extern struct jzfb_info jzfb;
+extern vidinfo_t panel_info;
 
 unsigned long lcd_get_size(void)
 {
diff -r 83787736d5c2 -r 25ad44524ef5 stage2/lcd.c
--- a/stage2/lcd.c	Tue Jun 09 21:10:40 2015 +0200
+++ b/stage2/lcd.c	Tue Jun 09 21:26:39 2015 +0200
@@ -18,8 +18,13 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef CONFIG_CPU_JZ4730_MINIPC
+#include "minipc_claa070vc01.h"
+#else
+#include "nanonote_gpm940b0.h"
+#endif
+
 #include "xburst_types.h"
-#include "nanonote_gpm940b0.h"
 #include "jzlcd.h"
 #include "sdram.h"
 #include "board.h"
diff -r 83787736d5c2 -r 25ad44524ef5 stage2/minipc_claa070vc01.c
--- a/stage2/minipc_claa070vc01.c	Tue Jun 09 21:10:40 2015 +0200
+++ b/stage2/minipc_claa070vc01.c	Tue Jun 09 21:26:39 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Minibook screen details
+ * MiniPC screen details
  *
  * Copyright (C) 2005-2007, Ingenic Semiconductor Inc.
  * Copyright (C) 2015 Paul Boddie <paul@boddie.org.uk>
diff -r 83787736d5c2 -r 25ad44524ef5 stage2/minipc_claa070vc01.h
--- a/stage2/minipc_claa070vc01.h	Tue Jun 09 21:10:40 2015 +0200
+++ b/stage2/minipc_claa070vc01.h	Tue Jun 09 21:26:39 2015 +0200
@@ -1,5 +1,5 @@
 /*
- * Minibook panel-specific definitions
+ * MiniPC panel-specific definitions
  *
  * Copyright (C) Xiangfu Liu <xiangfu@sharism.cc>
  * Copyright (C) 2015 Paul Boddie <paul@boddie.org.uk>
diff -r 83787736d5c2 -r 25ad44524ef5 stage2/stage2.c
--- a/stage2/stage2.c	Tue Jun 09 21:10:40 2015 +0200
+++ b/stage2/stage2.c	Tue Jun 09 21:26:39 2015 +0200
@@ -18,7 +18,12 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifdef CONFIG_CPU_JZ4730_MINIPC
+#include "board-minipc.h"
+#else
 #include "board-nanonote.h"
+#endif
+
 #include "lcd.h"
 
 void c_main(void)