adm5120: move common routerboot definitions into a separate header file

Those will be used on the ar71xx platform as well.

SVN-Revision: 33341

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/prom/routerboot.c b/target/linux/adm5120/files/arch/mips/adm5120/prom/routerboot.c
index c2e3a5e1680bb84efdc110ea13dac8da12bd020e..d9a06d968e629a084fc1cb5cf2ac80fcbb855c17 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/prom/routerboot.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/prom/routerboot.c
@@ -14,6 +14,7 @@
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/module.h>

+#include <linux/routerboot.h>

 
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>
 
 #include <asm/bootinfo.h>
 #include <asm/addrspace.h>

diff --git a/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/prom/routerboot.h b/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/prom/routerboot.h
index d5ad513d56be5e6f12d8433ab9432f7d942df15e..91ac05a630ddc6e713fde24c39edf77f72e78682 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/prom/routerboot.h
+++ b/target/linux/adm5120/files/arch/mips/include/asm/mach-adm5120/prom/routerboot.h
@@ -9,10 +9,8 @@
  *
  */
 
  *
  */
 

-#ifndef _ROUTERBOOT_H
-#define _ROUTERBOOT_H
-
-#define RB_MAC_SIZE            6
+#ifndef _PROM_ROUTERBOOT_H_
+#define _PROM_ROUTERBOOT_H_

 
 struct rb_bios_settings {
        u32     hs_offs; /* hard settings offset */
 
 struct rb_bios_settings {
        u32     hs_offs; /* hard settings offset */


@@ -30,96 +28,9 @@ struct rb_hard_settings {
        u8      *mac_base;      /* mac address base */
 };
 
        u8      *mac_base;      /* mac address base */
 };
 

-/*
- * Magic numbers
- */
-#define RB_MAGIC_HARD  0x64726148 /* "Hard" */
-#define RB_MAGIC_SOFT  0x74666F53 /* "Soft" */
-#define RB_MAGIC_DAWN  0x6E776144 /* "Dawn" */
-
-#define RB_ID_TERMINATOR       0
-
-/*
- * ID values for Hardware settings
- */
-#define RB_ID_HARD_01          1
-#define RB_ID_HARD_02          2
-#define RB_ID_FLASH_INFO       3
-#define RB_ID_MAC_ADDRESS_PACK 4
-#define RB_ID_BOARD_NAME       5
-#define RB_ID_BIOS_VERSION     6
-#define RB_ID_HARD_07          7
-#define RB_ID_SDRAM_TIMINGS    8
-#define RB_ID_DEVICE_TIMINGS   9
-#define RB_ID_SOFTWARE_ID      10
-#define RB_ID_SERIAL_NUMBER    11
-#define RB_ID_HARD_12          12
-#define RB_ID_MEMORY_SIZE      13
-#define RB_ID_MAC_ADDRESS_COUNT        14
-
-/*
- * ID values for Software settings
- */
-#define RB_ID_UART_SPEED       1
-#define RB_ID_BOOT_DELAY       2
-#define RB_ID_BOOT_DEVICE      3
-#define RB_ID_BOOT_KEY         4
-#define RB_ID_CPU_MODE         5
-#define RB_ID_FW_VERSION       6
-#define RB_ID_SOFT_07          7
-#define RB_ID_SOFT_08          8
-#define RB_ID_BOOT_PROTOCOL    9
-#define RB_ID_SOFT_10          10
-#define RB_ID_SOFT_11          11
-
-/*
- * UART_SPEED values
- */
-#define RB_UART_SPEED_115200   0
-#define RB_UART_SPEED_57600    1
-#define RB_UART_SPEED_38400    2
-#define RB_UART_SPEED_19200    3
-#define RB_UART_SPEED_9600     4
-#define RB_UART_SPEED_4800     5
-#define RB_UART_SPEED_2400     6
-#define RB_UART_SPEED_1200     7
-
-/*
- * BOOT_DELAY values
- */
-#define RB_BOOT_DELAY_0SEC     0
-#define RB_BOOT_DELAY_1SEC     1
-#define RB_BOOT_DELAY_2SEC     2
-
-/*
- * BOOT_DEVICE values
- */
-#define RB_BOOT_DEVICE_ETHER   0
-#define RB_BOOT_DEVICE_NANDETH 1
-#define RB_BOOT_DEVICE_ETHONCE 2
-#define RB_BOOT_DEVICE_NANDONLY        3
-
-/*
- * BOOT_KEY values
- */
-#define RB_BOOT_KEY_ANY                0
-#define RB_BOOT_KEY_DEL                1
-
-/*
- * CPU_MODE values
- */
-#define RB_CPU_MODE_POWERSAVE  0
-#define RB_CPU_MODE_REGULAR    1
-
-/*
- * BOOT_PROTOCOL values
- */
-#define RB_BOOT_PROTOCOL_BOOTP 0
-#define RB_BOOT_PROTOCOL_DHCP  1
-

 extern int routerboot_present(void) __init;
 extern char *routerboot_get_boardname(void);
 
 extern struct rb_hard_settings rb_hs;
 
 extern int routerboot_present(void) __init;
 extern char *routerboot_get_boardname(void);
 
 extern struct rb_hard_settings rb_hs;
 

-#endif /* _ROUTERBOOT_H */
+#endif /* _PROM_ROUTERBOOT_H_ */

diff --git a/target/linux/generic/files/include/linux/routerboot.h b/target/linux/generic/files/include/linux/routerboot.h
new file mode 100644 (file)
index 0000000..8e0391f
--- /dev/null
+++ b/target/linux/generic/files/include/linux/routerboot.h
@@ -0,0 +1,104 @@
+/*
+ *  Mikrotik's RouterBOOT definitions
+ *
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+
+#ifndef _ROUTERBOOT_H
+#define _ROUTERBOOT_H
+
+#define RB_MAC_SIZE            6
+
+/*
+ * Magic numbers
+ */
+#define RB_MAGIC_HARD  0x64726148 /* "Hard" */
+#define RB_MAGIC_SOFT  0x74666F53 /* "Soft" */
+#define RB_MAGIC_DAWN  0x6E776144 /* "Dawn" */
+
+#define RB_ID_TERMINATOR       0
+
+/*
+ * ID values for Hardware settings
+ */
+#define RB_ID_HARD_01          1
+#define RB_ID_HARD_02          2
+#define RB_ID_FLASH_INFO       3
+#define RB_ID_MAC_ADDRESS_PACK 4
+#define RB_ID_BOARD_NAME       5
+#define RB_ID_BIOS_VERSION     6
+#define RB_ID_HARD_07          7
+#define RB_ID_SDRAM_TIMINGS    8
+#define RB_ID_DEVICE_TIMINGS   9
+#define RB_ID_SOFTWARE_ID      10
+#define RB_ID_SERIAL_NUMBER    11
+#define RB_ID_HARD_12          12
+#define RB_ID_MEMORY_SIZE      13
+#define RB_ID_MAC_ADDRESS_COUNT        14
+
+/*
+ * ID values for Software settings
+ */
+#define RB_ID_UART_SPEED       1
+#define RB_ID_BOOT_DELAY       2
+#define RB_ID_BOOT_DEVICE      3
+#define RB_ID_BOOT_KEY         4
+#define RB_ID_CPU_MODE         5
+#define RB_ID_FW_VERSION       6
+#define RB_ID_SOFT_07          7
+#define RB_ID_SOFT_08          8
+#define RB_ID_BOOT_PROTOCOL    9
+#define RB_ID_SOFT_10          10
+#define RB_ID_SOFT_11          11
+
+/*
+ * UART_SPEED values
+ */
+#define RB_UART_SPEED_115200   0
+#define RB_UART_SPEED_57600    1
+#define RB_UART_SPEED_38400    2
+#define RB_UART_SPEED_19200    3
+#define RB_UART_SPEED_9600     4
+#define RB_UART_SPEED_4800     5
+#define RB_UART_SPEED_2400     6
+#define RB_UART_SPEED_1200     7
+
+/*
+ * BOOT_DELAY values
+ */
+#define RB_BOOT_DELAY_0SEC     0
+#define RB_BOOT_DELAY_1SEC     1
+#define RB_BOOT_DELAY_2SEC     2
+
+/*
+ * BOOT_DEVICE values
+ */
+#define RB_BOOT_DEVICE_ETHER   0
+#define RB_BOOT_DEVICE_NANDETH 1
+#define RB_BOOT_DEVICE_ETHONCE 2
+#define RB_BOOT_DEVICE_NANDONLY        3
+
+/*
+ * BOOT_KEY values
+ */
+#define RB_BOOT_KEY_ANY                0
+#define RB_BOOT_KEY_DEL                1
+
+/*
+ * CPU_MODE values
+ */
+#define RB_CPU_MODE_POWERSAVE  0
+#define RB_CPU_MODE_REGULAR    1
+
+/*
+ * BOOT_PROTOCOL values
+ */
+#define RB_BOOT_PROTOCOL_BOOTP 0
+#define RB_BOOT_PROTOCOL_DHCP  1
+
+#endif /* _ROUTERBOOT_H */