diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 75be306..8c90412 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -290,26 +290,26 @@ static void boot_prep_linux(bootm_headers_t *images)
    defined(CONFIG_SERIAL_TAG) || \
    defined(CONFIG_REVISION_TAG)
        debug("using: ATAGS\n");
-       setup_start_tag(gd->bd);
+/*     setup_start_tag(gd->bd);*/
 #ifdef CONFIG_SERIAL_TAG
-       setup_serial_tag(&params);
+/*     setup_serial_tag(&params);*/
 #endif
 #ifdef CONFIG_CMDLINE_TAG
-       setup_commandline_tag(gd->bd, commandline);
+/*     setup_commandline_tag(gd->bd, commandline);*/
 #endif
 #ifdef CONFIG_REVISION_TAG
-       setup_revision_tag(&params);
+/*     setup_revision_tag(&params);*/
 #endif
 #ifdef CONFIG_SETUP_MEMORY_TAGS
-       setup_memory_tags(gd->bd);
+/*     setup_memory_tags(gd->bd);*/
 #endif
 #ifdef CONFIG_INITRD_TAG
-       if (images->rd_start && images->rd_end)
+/*     if (images->rd_start && images->rd_end)
            setup_initrd_tag(gd->bd, images->rd_start,
-           images->rd_end);
+           images->rd_end);*/
 #endif
-       setup_board_tags(&params);
-       setup_end_tag(gd->bd);
+/*     setup_board_tags(&params);
+       setup_end_tag(gd->bd);*/
 #else /* all tags */
        printf("FDT and ATAGS support not compiled in - hanging\n");
        hang();
diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c
index 6049d7e..8161905 100644
--- a/board/nokia/rx51/rx51.c
+++ b/board/nokia/rx51/rx51.c
@@ -62,7 +62,7 @@ const omap3_sysinfo sysinfo = {
 };

 /* This structure contains default omap tags needed for booting Maemo 5 */
-static struct tag_omap omap[] = {
+/*static struct tag_omap omap[] = {
    OMAP_TAG_UART_CONFIG(0x04),
    OMAP_TAG_SERIAL_CONSOLE_CONFIG(0x03, 0x01C200),
    OMAP_TAG_LCD_CONFIG("acx565akm", "internal", 90, 0x18),
@@ -103,12 +103,13 @@ static struct tag_omap omap[] = {

 static char *boot_reason_ptr;
 static char *hw_build_ptr;
+*/

 /*
  * Routine: init_omap_tags
  * Description: Initialize pointers: boot_reason_ptr and hw_build_ptr
  */
-static void init_omap_tags(void)
+/*static void init_omap_tags(void)
 {
    int i = 0;
    while (omap[i].hdr.tag) {
@@ -139,26 +140,26 @@ static void reuse_omap_atags(struct tag_omap *t)
        }
        t = tag_omap_next(t);
    }
-}
+}*/

 /*
  * Routine: reuse_atags
  * Description: Reuse atags from previous bootloader.
  *              Reuse only only HW build and boot reason
  */
-static void reuse_atags(void)
+/*static void reuse_atags(void)
 {
    struct tag *t = (struct tag*)gd->bd->bi_boot_params;
-
+*/
    /* First tag must be ATAG_CORE */
-   if (t->hdr.tag != ATAG_CORE)
+/* if (t->hdr.tag != ATAG_CORE)
        return;

    if (!boot_reason_ptr || !hw_build_ptr)
        return;
-
+*/
    /* Last tag must be ATAG_NONE */
-   while (t->hdr.tag != ATAG_NONE) {
+/* while (t->hdr.tag != ATAG_NONE) {
        switch(t->hdr.tag) {
        case ATAG_REVISION:
            sprintf(hw_build_ptr, "%d", t->u.revision.rev);
@@ -169,7 +170,7 @@ static void reuse_atags(void)
        }
        t = tag_next(t);
    }
-}
+}*/

 /*
  * Routine: board_init
@@ -190,16 +191,16 @@ int board_init(void)
  * Routine: get_board_revision
  * Description: Return board revision.
  */
-u32 get_board_rev(void)
+/*u32 get_board_rev(void)
 {
    return simple_strtol(hw_build_ptr, NULL, 16);
-}
+}*/

 /*
  * Routine: setup_board_tags
  * Description: Append board specific boot tags.
  */
-void setup_board_tags(struct tag **in_params)
+/*void setup_board_tags(struct tag **in_params)
 {
    int setup_console_atag;
    char *str;
@@ -213,10 +214,10 @@ void setup_board_tags(struct tag **in_params)

    params->u.core.flags = 0x0;
    params->u.core.pagesize = 0x1000;
-   params->u.core.rootdev = 0x0;
+   params->u.core.rootdev = 0x0;*/

    /* append omap atag only if env setup_omap_atag is set to 1 */
-   str = getenv("setup_omap_atag");
+/* str = getenv("setup_omap_atag");
    if (!str || strcmp(str, "1") != 0)
        return;

@@ -230,18 +231,18 @@ void setup_board_tags(struct tag **in_params)
    t = (struct tag_omap *)&params->u;
    total_size = sizeof(struct tag_header);

-   for (i = 0; omap[i].hdr.tag; ++i) {
+   for (i = 0; omap[i].hdr.tag; ++i) {*/

        /* skip serial console tag */
-       if (!setup_console_atag &&
+/*     if (!setup_console_atag &&
            omap[i].hdr.tag == OMAP_TAG_SERIAL_CONSOLE)
            continue;

        size = omap[i].hdr.size + sizeof(struct tag_omap_header);
-       memcpy(t, &omap[i], size);
+       memcpy(t, &omap[i], size);*/

        /* set uart tag to 0 - disable serial console */
-       if (!setup_console_atag && omap[i].hdr.tag == OMAP_TAG_UART)
+/*     if (!setup_console_atag && omap[i].hdr.tag == OMAP_TAG_UART)
            t->u.uart.enabled_uarts = 0;

        total_size += size;
@@ -254,7 +255,7 @@ void setup_board_tags(struct tag **in_params)
    params = tag_next(params);

    *in_params = params;
-}
+}*/

 /*
  * Routine: video_hw_init
@@ -285,6 +286,7 @@ static void twl4030_regulator_set_mode(u8 id, u8 mode)
            TWL4030_PM_MASTER_PB_WORD_LSB);
 }

+#if 0
 static void omap3_emu_romcode_call(u32 service_id, u32 *parameters)
 {
    u32 i, num_params = *parameters;
@@ -327,6 +329,7 @@ static void omap3_update_aux_cr_secure_rx51(u32 set_bits, u32 clear_bits)
    omap3_emu_romcode_call(OMAP3_EMU_HAL_API_WRITE_ACR,
                (u32 *)&emu_romcode_params);
 }
+#endif

 /*
  * Routine: misc_init_r
@@ -368,19 +371,21 @@ int misc_init_r(void)
    setenv("rx51_kernaddr", buf);

    /* initialize omap tags */
-   init_omap_tags();
+/* init_omap_tags();*/

    /* reuse atags from previous bootloader */
-   reuse_atags();
+/* reuse_atags();*/

    dieid_num_r();
    print_cpuinfo();

+#if 0
    /*
     * Cortex-A8(r1p0..r1p2) errata 430973 workaround
     * Set IBE bit in Auxiliary Control Register
     */
    omap3_update_aux_cr_secure_rx51(1 << 6, 0);
+#endif

    return 0;
 }