This patch unifies the use of config options in v2 to all start with CONFIG_

[coreboot.git] / src / cpu / amd / car / copy_and_run.c

diff --git a/src/cpu/amd/car/copy_and_run.c b/src/cpu/amd/car/copy_and_run.c
index 55068c5511567de0abf49b8b18c41d42adf4ee71..f495f6dbbade4a8ddcac207e209e1181a4880a84 100644 (file)
--- a/src/cpu/amd/car/copy_and_run.c
+++ b/src/cpu/amd/car/copy_and_run.c
@@ -1,135 +1,63 @@
 /* by yhlu 6.2005 
        moved from nrv2v.c and some lines from crt0.S
+   2006/05/02 - stepan: move nrv2b to an extra file.
 */
-#ifndef ENDIAN
-#define ENDIAN   0
-#endif
-#ifndef BITSIZE
-#define BITSIZE 32
-#endif
 
-#define GETBIT_8(bb, src, ilen) \
-    (((bb = bb & 0x7f ? bb*2 : ((unsigned)src[ilen++]*2+1)) >> 8) & 1)
+#if CONFIG_CBFS == 1
+void cbfs_and_run_core(char*, unsigned ebp);
 
-#define GETBIT_LE16(bb, src, ilen) \
-    (bb*=2,bb&0xffff ? (bb>>16)&1 : (ilen+=2,((bb=(src[ilen-2]+src[ilen-1]*256u)*2+1)>>16)&1))
+static void copy_and_run(void)
+{
+# if CONFIG_USE_FALLBACK_IMAGE == 1
+       cbfs_and_run_core("fallback/coreboot_ram", 0);
+# else
+       cbfs_and_run_core("normal/coreboot_ram", 0);
+# endif
+}
 
-#define GETBIT_LE32(bb, src, ilen) \
-    (bc > 0 ? ((bb>>--bc)&1) : (bc=31,\
-    bb=*(const uint32_t *)((src)+ilen),ilen+=4,(bb>>31)&1))
+#if CONFIG_AP_CODE_IN_CAR == 1
 
-#if ENDIAN == 0 && BITSIZE == 8
-#define GETBIT(bb, src, ilen) GETBIT_8(bb, src, ilen)
-#endif
-#if ENDIAN == 0 && BITSIZE == 16
-#define GETBIT(bb, src, ilen) GETBIT_LE16(bb, src, ilen)
-#endif
-#if ENDIAN == 0 && BITSIZE == 32
-#define GETBIT(bb, src, ilen) GETBIT_LE32(bb, src, ilen)
+static void copy_and_run_ap_code_in_car(unsigned ret_addr)
+{
+# if CONFIG_USE_FALLBACK_IMAGE == 1
+       cbfs_and_run_core("fallback/coreboot_apc", ret_addr);
+# else
+       cbfs_and_run_core("normal/coreboot_apc", ret_addr);
+# endif
+}
 #endif
 
-static inline void print_debug_cp_run(const char *strval, uint32_t val)
-{
-#if CONFIG_USE_INIT
-        printk_debug("%s%08x\r\n", strval, val);
 #else
-        print_debug(strval); print_debug_hex32(val); print_debug("\r\n");
-#endif
-}
+void copy_and_run_core(u8 *src, u8 *dst, unsigned long ilen, unsigned ebp);
+
+extern u8 _liseg, _iseg, _eiseg;
 
-static void copy_and_run(unsigned cpu_reset)
+static void copy_and_run(void)
 {
        uint8_t *src, *dst; 
-        unsigned long ilen = 0, olen = 0, last_m_off =  1;
-        uint32_t bb = 0;
-        unsigned bc = 0;
-
-       print_debug("Copying LinuxBIOS to ram.\r\n");
+        unsigned long ilen;
 
-#if !CONFIG_COMPRESS 
-       __asm__ volatile (
-               "leal _liseg, %0\n\t"
-               "leal _iseg, %1\n\t"
-               "leal _eiseg, %2\n\t"
-               "subl %1, %2\n\t"
-               : "=a" (src), "=b" (dst), "=c" (olen)
-       );
-       memcpy(src, dst, olen);
-#else 
+       src = &_liseg;
+       dst = &_iseg;
+       ilen = &_eiseg - dst;
 
-        __asm__ volatile (
-               "leal  4+_liseg, %0\n\t"
-               "leal    _iseg,  %1\n\t"
-                : "=a" (src) , "=b" (dst)
-        );
+       copy_and_run_core(src, dst, ilen, 0);
+}
 
-       print_debug_cp_run("src=",(uint32_t)src); 
-       print_debug_cp_run("dst=",(uint32_t)dst);
-       
-//     dump_mem(src, src+0x100);
+#if CONFIG_AP_CODE_IN_CAR == 1
 
-        for(;;) {
-                unsigned int m_off, m_len;
-                while(GETBIT(bb, src, ilen)) {
-                        dst[olen++] = src[ilen++];
-                }
-                m_off = 1;
-                do {
-                        m_off = m_off*2 + GETBIT(bb, src, ilen);
-                } while (!GETBIT(bb, src, ilen));
-                if (m_off == 2)
-                {
-                        m_off = last_m_off;
-                }
-                else
-                {
-                        m_off = (m_off - 3)*256 + src[ilen++];
-                        if(m_off == 0xffffffffU) 
-                                break;
-                        last_m_off = ++m_off;
-                }
-                m_len = GETBIT(bb, src, ilen);
-                m_len = m_len*2 + GETBIT(bb, src, ilen);
-                if (m_len == 0)
-                {
-                        m_len++;
-                        do {
-                                m_len = m_len*2 + GETBIT(bb, src, ilen);
-                        } while(!GETBIT(bb, src, ilen));
-                        m_len += 2;
-                }
-                m_len += (m_off > 0xd00);
-                {
-                        const uint8_t *m_pos;
-                        m_pos = dst + olen - m_off;
-                        dst[olen++] = *m_pos++;
-                        do {
-                                dst[olen++] = *m_pos++;
-                        } while(--m_len > 0);
-                }
-        }
-#endif
-//     dump_mem(dst, dst+0x100);
+extern u8 _liseg_apc, _iseg_apc, _eiseg_apc;
 
-       print_debug_cp_run("linxbios_ram.bin length = ", olen);
-
-       print_debug("Jumping to LinuxBIOS.\r\n");
+static void copy_and_run_ap_code_in_car(unsigned ret_addr)
+{
+        uint8_t *src, *dst;
+        unsigned long ilen;
 
-       if(cpu_reset == 1 ) {
-               __asm__ volatile (
-                       "movl $0xffffffff, %ebp\n\t"
-               );
-       }
-       else {
-                __asm__ volatile (
-                        "xorl %ebp, %ebp\n\t"
-                );
-       }
-       
-       __asm__ volatile (
-               "cli\n\t"
-               "leal    _iseg, %edi\n\t"
-               "jmp     *%edi\n\t"
-       );
+       src = &_liseg_apc;
+       dst = &_iseg_apc;
+       ilen = &_eiseg_apc - dst;
 
+       copy_and_run_core(src, dst, ilen, ret_addr);
 }
+#endif
+#endif