tsec: use IO accessors for IO accesses

[karo-tx-uboot.git] / include / image.h

diff --git a/include/image.h b/include/image.h
index 294eba5094bff457c45b31fa26086cf78a4a0583..005e0d24e4d99ac592d823f2a51dbf8dd2e51ecb 100644 (file)
--- a/include/image.h
+++ b/include/image.h
@@ -83,6 +83,7 @@
 #define IH_OS_ARTOS            19      /* ARTOS        */
 #define IH_OS_UNITY            20      /* Unity OS     */
 #define IH_OS_INTEGRITY                21      /* INTEGRITY    */
+#define IH_OS_OSE              22      /* OSE          */
 
 /*
  * CPU Architecture Codes (supported by Linux)
@@ -299,14 +300,14 @@ typedef struct table_entry {
  * entry that matches the given short name. If a matching entry is
  * found, it's id is returned to the caller.
  */
-int get_table_entry_id (table_entry_t *table,
+int get_table_entry_id(const table_entry_t *table,
                const char *table_name, const char *name);
 /*
  * get_table_entry_name() scans the translation table trying to find
  * an entry that matches the given id. If a matching entry is found,
  * its long name is returned to the caller.
  */
-char *get_table_entry_name (table_entry_t *table, char *msg, int id);
+char *get_table_entry_name(const table_entry_t *table, char *msg, int id);
 
 const char *genimg_get_os_name (uint8_t os);
 const char *genimg_get_arch_name (uint8_t arch);
@@ -328,25 +329,28 @@ int genimg_get_format (void *img_addr);
 int genimg_has_config (bootm_headers_t *images);
 ulong genimg_get_image (ulong img_addr);
 
-int boot_get_ramdisk (int argc, char *argv[], bootm_headers_t *images,
+int boot_get_ramdisk (int argc, char * const argv[], bootm_headers_t *images,
                uint8_t arch, ulong *rd_start, ulong *rd_end);
 
 
 #ifdef CONFIG_OF_LIBFDT
-int boot_get_fdt (int flag, int argc, char *argv[], bootm_headers_t *images,
+int boot_get_fdt (int flag, int argc, char * const argv[], bootm_headers_t *images,
                char **of_flat_tree, ulong *of_size);
 int boot_relocate_fdt (struct lmb *lmb, ulong bootmap_base,
                char **of_flat_tree, ulong *of_size);
 #endif
 
-#if defined(CONFIG_PPC) || defined(CONFIG_M68K)
+#ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
 int boot_ramdisk_high (struct lmb *lmb, ulong rd_data, ulong rd_len,
                  ulong *initrd_start, ulong *initrd_end);
-
+#endif /* CONFIG_SYS_BOOT_RAMDISK_HIGH */
+#ifdef CONFIG_SYS_BOOT_GET_CMDLINE
 int boot_get_cmdline (struct lmb *lmb, ulong *cmd_start, ulong *cmd_end,
                        ulong bootmap_base);
+#endif /* CONFIG_SYS_BOOT_GET_CMDLINE */
+#ifdef CONFIG_SYS_BOOT_GET_KBD
 int boot_get_kbd (struct lmb *lmb, bd_t **kbd, ulong bootmap_base);
-#endif /* CONFIG_PPC || CONFIG_M68K */
+#endif /* CONFIG_SYS_BOOT_GET_KBD */
 #endif /* !USE_HOSTCC */
 
 /*******************************************************************/
@@ -362,23 +366,23 @@ static inline uint32_t image_get_header_size (void)
        { \
                return uimage_to_cpu (hdr->ih_##f); \
        }
-image_get_hdr_l (magic);       /* image_get_magic */
-image_get_hdr_l (hcrc);                /* image_get_hcrc */
-image_get_hdr_l (time);                /* image_get_time */
-image_get_hdr_l (size);                /* image_get_size */
-image_get_hdr_l (load);                /* image_get_load */
-image_get_hdr_l (ep);          /* image_get_ep */
-image_get_hdr_l (dcrc);                /* image_get_dcrc */
+image_get_hdr_l (magic)                /* image_get_magic */
+image_get_hdr_l (hcrc)         /* image_get_hcrc */
+image_get_hdr_l (time)         /* image_get_time */
+image_get_hdr_l (size)         /* image_get_size */
+image_get_hdr_l (load)         /* image_get_load */
+image_get_hdr_l (ep)           /* image_get_ep */
+image_get_hdr_l (dcrc)         /* image_get_dcrc */
 
 #define image_get_hdr_b(f) \
        static inline uint8_t image_get_##f(const image_header_t *hdr) \
        { \
                return hdr->ih_##f; \
        }
-image_get_hdr_b (os);          /* image_get_os */
-image_get_hdr_b (arch);                /* image_get_arch */
-image_get_hdr_b (type);                /* image_get_type */
-image_get_hdr_b (comp);                /* image_get_comp */
+image_get_hdr_b (os)           /* image_get_os */
+image_get_hdr_b (arch)         /* image_get_arch */
+image_get_hdr_b (type)         /* image_get_type */
+image_get_hdr_b (comp)         /* image_get_comp */
 
 static inline char *image_get_name (const image_header_t *hdr)
 {
@@ -420,23 +424,23 @@ static inline ulong image_get_image_end (const image_header_t *hdr)
        { \
                hdr->ih_##f = cpu_to_uimage (val); \
        }
-image_set_hdr_l (magic);       /* image_set_magic */
-image_set_hdr_l (hcrc);                /* image_set_hcrc */
-image_set_hdr_l (time);                /* image_set_time */
-image_set_hdr_l (size);                /* image_set_size */
-image_set_hdr_l (load);                /* image_set_load */
-image_set_hdr_l (ep);          /* image_set_ep */
-image_set_hdr_l (dcrc);                /* image_set_dcrc */
+image_set_hdr_l (magic)                /* image_set_magic */
+image_set_hdr_l (hcrc)         /* image_set_hcrc */
+image_set_hdr_l (time)         /* image_set_time */
+image_set_hdr_l (size)         /* image_set_size */
+image_set_hdr_l (load)         /* image_set_load */
+image_set_hdr_l (ep)           /* image_set_ep */
+image_set_hdr_l (dcrc)         /* image_set_dcrc */
 
 #define image_set_hdr_b(f) \
        static inline void image_set_##f(image_header_t *hdr, uint8_t val) \
        { \
                hdr->ih_##f = val; \
        }
-image_set_hdr_b (os);          /* image_set_os */
-image_set_hdr_b (arch);                /* image_set_arch */
-image_set_hdr_b (type);                /* image_set_type */
-image_set_hdr_b (comp);                /* image_set_comp */
+image_set_hdr_b (os)           /* image_set_os */
+image_set_hdr_b (arch)         /* image_set_arch */
+image_set_hdr_b (type)         /* image_set_type */
+image_set_hdr_b (comp)         /* image_set_comp */
 
 static inline void image_set_name (image_header_t *hdr, const char *name)
 {