Merge tag 'gpio-v4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux...

[karo-tx-linux.git] / arch / mips / cavium-octeon / octeon_boot.h

diff --git a/arch/mips/cavium-octeon/octeon_boot.h b/arch/mips/cavium-octeon/octeon_boot.h
index 7b066bbca86d11f9020932475854e85944347db7..a6ce7c43e0aea16655a6da5560d15154396d27fb 100644 (file)
--- a/arch/mips/cavium-octeon/octeon_boot.h
+++ b/arch/mips/cavium-octeon/octeon_boot.h
@@ -37,11 +37,13 @@ struct boot_init_vector {
 
 /* similar to bootloader's linux_app_boot_info but without global data */
 struct linux_app_boot_info {
+#ifdef __BIG_ENDIAN_BITFIELD
        uint32_t labi_signature;
        uint32_t start_core0_addr;
        uint32_t avail_coremask;
        uint32_t pci_console_active;
        uint32_t icache_prefetch_disable;
+       uint32_t padding;
        uint64_t InitTLBStart_addr;
        uint32_t start_app_addr;
        uint32_t cur_exception_base;
@@ -49,6 +51,27 @@ struct linux_app_boot_info {
        uint32_t compact_flash_common_base_addr;
        uint32_t compact_flash_attribute_base_addr;
        uint32_t led_display_base_addr;
+#else
+       uint32_t start_core0_addr;
+       uint32_t labi_signature;
+
+       uint32_t pci_console_active;
+       uint32_t avail_coremask;
+
+       uint32_t padding;
+       uint32_t icache_prefetch_disable;
+
+       uint64_t InitTLBStart_addr;
+
+       uint32_t cur_exception_base;
+       uint32_t start_app_addr;
+
+       uint32_t compact_flash_common_base_addr;
+       uint32_t no_mark_private_data;
+
+       uint32_t led_display_base_addr;
+       uint32_t compact_flash_attribute_base_addr;
+#endif
 };
 
 /* If not to copy a lot of bootloader's structures