made config and file names more consistent to $BOARD+$EXPANDER scheme

7 files changed, 116 insertions, 7 deletions

diff --git a/u-boot/include/configs/omap3_beaglehyb.h b/u-boot/include/configs/omap3_beagleb1.h
index 4f82622..60191e3 100644
--- a/u-boot/include/configs/omap3_beaglehyb.h
+++ b/u-boot/include/configs/omap3_beagleb1.h
@@ -24,7 +24,7 @@
  * MA 02111-1307 USA
  */
 
-#define CONFIG_OMAP3_BEAGLE_HYBRID	1	/* working with BEAGLE and OMB Hybrid */
+#define CONFIG_GOLDELICO_EXPANDER_B1	1		/* working with BEAGLE and OMB Hybrid */
 
 #include "omap3_beagle.h"	/* share config */
 
@@ -35,7 +35,7 @@
 // FIXME: add configs for the partitions so that JFFS2 runs in the correct NAND partition
 
 #undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT		"Openmoko Beagle Hybrid # "
+#define CONFIG_SYS_PROMPT		"Openmoko Beagle B1 # "
 
 
 /* __CONFIG_H */
diff --git a/u-boot/include/configs/omap3_beagleexpander.h b/u-boot/include/configs/omap3_beagleb2.h
index 89faadf..7ce4a3a 100644
--- a/u-boot/include/configs/omap3_beagleexpander.h
+++ b/u-boot/include/configs/omap3_beagleb2.h
@@ -24,7 +24,7 @@
  * MA 02111-1307 USA
  */
 
-#define CONFIG_OMAP3_BEAGLE_EXPANDER	1	/* working with BEAGLE and Expander board */
+#define CONFIG_GOLDELICO_EXPANDER_B2	1	/* working with BEAGLE and B2 Expander board */
 
 #include "omap3_beagle.h"	/* share config */
 
@@ -46,7 +46,7 @@
 // FIXME: add configs for the partitions so that JFFS2 runs in the correct NAND partition
 
 #undef CONFIG_SYS_PROMPT
-#define CONFIG_SYS_PROMPT		"Openmoko Beagle Expander # "
+#define CONFIG_SYS_PROMPT		"Openmoko Beagle B2 # "
 
 
 /* __CONFIG_H */
diff --git a/u-boot/include/configs/omap3_beagleb4.h b/u-boot/include/configs/omap3_beagleb4.h
new file mode 100644
index 0000000..cb8ac01
--- /dev/null
+++ b/u-boot/include/configs/omap3_beagleb4.h
@@ -0,0 +1,41 @@
+/*
+ * (C) Copyright 2010
+ * Nikolaus Schaller <hns@goldelico.com>
+ *
+ * Configuration settings for the TI OMAP3530 Beagle board with
+ *               Openmoko Hybrid Display extension.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#define CONFIG_GOLDELICO_EXPANDER_B4	1		/* working with BEAGLE and B4 extension board */
+
+#include "omap3_beagle.h"	/* share config */
+
+#define CONFIG_CMD_UNZIP	1	/* for reducing size of splash image */
+// #undef CONFIG_CMD_JFFS2
+// #define CONFIG_CMD_JFFS2	1	/* to access the rootfs in NAND flash */
+
+// FIXME: add configs for the partitions so that JFFS2 runs in the correct NAND partition
+
+#undef CONFIG_SYS_PROMPT
+#define CONFIG_SYS_PROMPT		"Openmoko Beagle B4 # "
+
+
+/* __CONFIG_H */
diff --git a/u-boot/include/configs/omap3_gta04.h b/u-boot/include/configs/omap3_gta04.h
index 824c650..dc84fa1 100644
--- a/u-boot/include/configs/omap3_gta04.h
+++ b/u-boot/include/configs/omap3_gta04.h
@@ -23,12 +23,11 @@
  * MA 02111-1307 USA
  */
 
-/* working with BEAGLE and GTA04 */
 #define CONFIG_OMAP3_GTA04		y
 /* enable to include patches and fixes for GTA04A2 */
 /* #define CONFIG_OMAP3_GTA04A2	y */
  
-#include "omap3_beaglehyb.h"	/* share config */
+#include "omap3_beagle.h"	/* share config */
 
 #undef CONFIG_SYS_PROMPT
 #define CONFIG_SYS_PROMPT		"GTA04 # "
diff --git a/u-boot/include/configs/omap3_gta04b2.h b/u-boot/include/configs/omap3_gta04b2.h
index 04527db..16f92a4 100644
--- a/u-boot/include/configs/omap3_gta04b2.h
+++ b/u-boot/include/configs/omap3_gta04b2.h
@@ -23,8 +23,11 @@
  * MA 02111-1307 USA
  */
 
-#define CONFIG_OMAP3_BEAGLE_EXPANDER y
+#define CONFIG_GOLDELICO_EXPANDER_B2 y
 
 #include "omap3_gta04.h"	/* share config */
 
+#undef CONFIG_SYS_PROMPT
+#define CONFIG_SYS_PROMPT		"GTA04b2 # "
+
 /* __CONFIG_H */
diff --git a/u-boot/include/configs/omap3_gta04b3.h b/u-boot/include/configs/omap3_gta04b3.h
new file mode 100644
index 0000000..62d9d90
--- /dev/null
+++ b/u-boot/include/configs/omap3_gta04b3.h
@@ -0,0 +1,33 @@
+/*
+ * (C) Copyright 2010
+ * Nikolaus Schaller <hns@goldelico.com>
+ *
+ * Configuration settings for the GTA04.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#define CONFIG_GOLDELICO_EXPANDER_B3 y
+
+#include "omap3_gta04.h"	/* share config */
+
+#undef CONFIG_SYS_PROMPT
+#define CONFIG_SYS_PROMPT		"GTA04b3 # "
+
+/* __CONFIG_H */
diff --git a/u-boot/include/configs/omap3_gta04b4.h b/u-boot/include/configs/omap3_gta04b4.h
new file mode 100644
index 0000000..96a5ebe
--- /dev/null
+++ b/u-boot/include/configs/omap3_gta04b4.h
@@ -0,0 +1,33 @@
+/*
+ * (C) Copyright 2010
+ * Nikolaus Schaller <hns@goldelico.com>
+ *
+ * Configuration settings for the GTA04.
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#define CONFIG_GOLDELICO_EXPANDER_B4 y
+
+#include "omap3_gta04.h"	/* share config */
+
+#undef CONFIG_SYS_PROMPT
+#define CONFIG_SYS_PROMPT		"GTA04b4 # "
+
+/* __CONFIG_H */