This does away with CONFIG_ROM_PAYLOAD_START and CONFIG_PAYLOAD_SIZE.

[coreboot.git] / src / southbridge / nvidia / ck804 / id.inc

diff --git a/src/southbridge/nvidia/ck804/id.inc b/src/southbridge/nvidia/ck804/id.inc
index b9845a576151600ecdca56ff5099870a43caf89e..3200a7d7de9bcc0193da63263d99310a0f00d1ae 100644 (file)
--- a/src/southbridge/nvidia/ck804/id.inc
+++ b/src/southbridge/nvidia/ck804/id.inc
@@ -1,15 +1,14 @@
-
        .section ".id", "a", @progbits
 
        .globl __id_start
 __id_start:
 vendor:
-       .asciz MAINBOARD_VENDOR
+       .asciz CONFIG_MAINBOARD_VENDOR
 part:
-       .asciz MAINBOARD_PART_NUMBER
-.long __id_end + 0x80 - vendor  /* Reverse offset to the vendor id */
-.long __id_end + 0x80 - part    /* Reverse offset to the part number */
-.long PAYLOAD_SIZE + ROM_IMAGE_SIZE  /* Size of this romimage */
+       .asciz CONFIG_MAINBOARD_PART_NUMBER
+.long __id_end + 0x80 - vendor       /* Reverse offset to the vendor ID */
+.long __id_end + 0x80 - part         /* Reverse offset to the part number */
+.long CONFIG_ROM_SIZE                /* Size of this ROM image */
        .globl __id_end
 
 __id_end: