coreboot-gerrit August 2014

coreboot-gerrit@coreboot.org

1 participants
1011 discussions

Patch merged into coreboot/master: 1c07c22 mainboard/amd: De-ASCIIartify AGESA board headers
by gerrit＠coreboot.org 06 Aug '14

06 Aug '14

the following patch was just integrated into master: commit 1c07c2205e0513e0570597ae793425820ae0844a Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Wed Jul 16 19:50:52 2014 +1000 mainboard/amd: De-ASCIIartify AGESA board headers As was done for the reference boards in: cd30951 mainboard/amd: De-ASCIIartify reference boards Change-Id: Ie34aa5269388b771daa6934f8aff0314ac6778d5 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-on: http://review.coreboot.org/6290 Tested-by: build bot (Jenkins) Reviewed-by: Dave Frodin <dave.frodin(a)se-eng.com> See http://review.coreboot.org/6290 for details. -gerrit

1 0

Patch set updated for coreboot: 15a6eab superio/smsc/sch4037: Cleanup and fix .c inclusion
by Edward O'Callaghan 06 Aug '14

06 Aug '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6509 -gerrit commit 15a6eab14578464c46416dbc34c457f6c764f58e Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Wed Aug 6 21:32:50 2014 +1000 superio/smsc/sch4037: Cleanup and fix .c inclusion Clean up both ram and rom stage support and fix board to match. Change-Id: I55e3e7338c0551f0fb663eb9707f16ecdc1aca35 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/mainboard/amd/dinar/romstage.c | 2 +- src/superio/smsc/sch4037/Makefile.inc | 1 + src/superio/smsc/sch4037/sch4037.h | 5 ++-- src/superio/smsc/sch4037/sch4037_early_init.c | 11 ++++--- src/superio/smsc/sch4037/superio.c | 43 ++++++++++----------------- 5 files changed, 28 insertions(+), 34 deletions(-) diff --git a/src/mainboard/amd/dinar/romstage.c b/src/mainboard/amd/dinar/romstage.c index 8cc3d9a..1b32e30 100644 --- a/src/mainboard/amd/dinar/romstage.c +++ b/src/mainboard/amd/dinar/romstage.c @@ -32,7 +32,7 @@ #include "agesawrapper.h" #include <northbridge/amd/agesa/agesawrapper_call.h> #include "cpu/x86/bist.h" -#include "superio/smsc/sch4037/sch4037_early_init.c" +#include <superio/smsc/sch4037/sch4037.h> #include <superio/smsc/sio1036/sio1036.h> #include "cpu/x86/lapic.h" #include "nb_cimx.h" diff --git a/src/superio/smsc/sch4037/Makefile.inc b/src/superio/smsc/sch4037/Makefile.inc index d1fc8ae..473f731 100644 --- a/src/superio/smsc/sch4037/Makefile.inc +++ b/src/superio/smsc/sch4037/Makefile.inc @@ -17,4 +17,5 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # +romstage-$(CONFIG_SUPERIO_SMSC_SCH4037) += sch4037_early_init.c ramstage-$(CONFIG_SUPERIO_SMSC_SCH4037) += superio.c diff --git a/src/superio/smsc/sch4037/sch4037.h b/src/superio/smsc/sch4037/sch4037.h index d065489..23f1e1e 100644 --- a/src/superio/smsc/sch4037/sch4037.h +++ b/src/superio/smsc/sch4037/sch4037.h @@ -20,7 +20,6 @@ #ifndef SUPERIO_SCH_4037_H #define SUPERIO_SCH_4037_H - #define SCH4037_FDD 0 /* FDD */ #define SCH4037_LPT 3 /* LPT */ #define SMSCSUPERIO_SP1 4 /* Com1 */ @@ -31,4 +30,6 @@ #define SCH4037_RUNTIME 0x0A /* Runtime */ #define SCH4037_XBUS 0x0B /* X-BUS */ -#endif //SUPERIO_SCH_4037_H +void sch4037_early_init(unsigned port); + +#endif /* SUPERIO_SCH_4037_H */ diff --git a/src/superio/smsc/sch4037/sch4037_early_init.c b/src/superio/smsc/sch4037/sch4037_early_init.c index 29517ed..099e5f2 100644 --- a/src/superio/smsc/sch4037/sch4037_early_init.c +++ b/src/superio/smsc/sch4037/sch4037_early_init.c @@ -19,21 +19,24 @@ #include <arch/io.h> +#include <device/pnp.h> +#include <stdint.h> + #include "sch4037.h" -static inline void pnp_enter_conf_state(device_t dev) +static void pnp_enter_conf_state(device_t dev) { - unsigned port = dev>>8; + unsigned port = dev >> 8; outb(0x55, port); } static void pnp_exit_conf_state(device_t dev) { - unsigned port = dev>>8; + unsigned port = dev >> 8; outb(0xaa, port); } -static inline void sch4037_early_init(unsigned port) +void sch4037_early_init(unsigned port) { device_t dev; diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c index 35df431..ad8d8b4 100644 --- a/src/superio/smsc/sch4037/superio.c +++ b/src/superio/smsc/sch4037/superio.c @@ -24,20 +24,23 @@ #include <device/pnp.h> #include <superio/conf_mode.h> #include <console/console.h> -#include <device/smbus.h> -#include <string.h> #include <pc80/keyboard.h> #include <stdlib.h> + #include "sch4037.h" -/* Forward declarations */ -static void enable_dev(device_t dev); -static void sch4037_init(device_t dev); +static void sch4037_init(device_t dev) +{ + if (!dev->enabled) { + return; + } -struct chip_operations superio_smsc_sch4037_ops = { - CHIP_NAME("SMSC SCH4037 Super I/O") - .enable_dev = enable_dev, -}; + switch(dev->path.pnp.device) { + case SCH4037_KBC: + pc_keyboard_init(); + break; + } +} static struct device_operations ops = { .read_resources = pnp_read_resources, @@ -54,24 +57,10 @@ static struct pnp_info pnp_dev_info[] = { static void enable_dev(device_t dev) { - printk(BIOS_SPEW, "file '%s',line %d, %s()\n", __FILE__, __LINE__, __func__); pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } -static void sch4037_init(device_t dev) -{ - struct resource *res0, *res1; - - if (!dev->enabled) { - return; - } - - switch(dev->path.pnp.device) { - - case SCH4037_KBC: - res0 = find_resource(dev, PNP_IDX_IO0); - res1 = find_resource(dev, PNP_IDX_IO1); - pc_keyboard_init(); - break; - } -} +struct chip_operations superio_smsc_sch4037_ops = { + CHIP_NAME("SMSC SCH4037 Super I/O") + .enable_dev = enable_dev, +};

1 0

Patch merged into coreboot/master: 70d4b52 gizmosphere/gizmo: Change the PCIe GPP to two x1 ports
by gerrit＠coreboot.org 06 Aug '14

06 Aug '14

the following patch was just integrated into master: commit 70d4b5261e0667640ed9e137791388aa5c732a8e Author: Dave Frodin <dave.frodin(a)se-eng.com> Date: Tue Aug 5 10:20:59 2014 -0600 gizmosphere/gizmo: Change the PCIe GPP to two x1 ports Gizmo sends two southbridge GPP PCIe lanes to its high speed edge connector. This change will allow developers to create two x1 slots on an extender card. Change-Id: Iba6c1a4caf7846d12e3960775d7bc906ca8ff385 Signed-off-by: Dave Frodin <dave.frodin(a)se-eng.com> Reviewed-on: http://review.coreboot.org/6499 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See http://review.coreboot.org/6499 for details. -gerrit

1 0

New patch to review for coreboot: 8f4fa5a superio/smsc/sch4037: Cleanup and fix .c inclusion
by Edward O'Callaghan 06 Aug '14

06 Aug '14

Edward O'Callaghan (eocallaghan(a)alterapraxis.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6509 -gerrit commit 8f4fa5ab34cd3f7551bfafbd1fce28ef72f4aa1b Author: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Date: Wed Aug 6 21:32:50 2014 +1000 superio/smsc/sch4037: Cleanup and fix .c inclusion Clean up both ram and rom stage support and fix board to match. Change-Id: I55e3e7338c0551f0fb663eb9707f16ecdc1aca35 Signed-off-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> --- src/mainboard/amd/dinar/romstage.c | 2 +- src/superio/smsc/sch4037/Makefile.inc | 1 + src/superio/smsc/sch4037/sch4037.h | 5 ++-- src/superio/smsc/sch4037/sch4037_early_init.c | 2 +- src/superio/smsc/sch4037/superio.c | 43 ++++++++++----------------- 5 files changed, 22 insertions(+), 31 deletions(-) diff --git a/src/mainboard/amd/dinar/romstage.c b/src/mainboard/amd/dinar/romstage.c index 8cc3d9a..1b32e30 100644 --- a/src/mainboard/amd/dinar/romstage.c +++ b/src/mainboard/amd/dinar/romstage.c @@ -32,7 +32,7 @@ #include "agesawrapper.h" #include <northbridge/amd/agesa/agesawrapper_call.h> #include "cpu/x86/bist.h" -#include "superio/smsc/sch4037/sch4037_early_init.c" +#include <superio/smsc/sch4037/sch4037.h> #include <superio/smsc/sio1036/sio1036.h> #include "cpu/x86/lapic.h" #include "nb_cimx.h" diff --git a/src/superio/smsc/sch4037/Makefile.inc b/src/superio/smsc/sch4037/Makefile.inc index d1fc8ae..473f731 100644 --- a/src/superio/smsc/sch4037/Makefile.inc +++ b/src/superio/smsc/sch4037/Makefile.inc @@ -17,4 +17,5 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # +romstage-$(CONFIG_SUPERIO_SMSC_SCH4037) += sch4037_early_init.c ramstage-$(CONFIG_SUPERIO_SMSC_SCH4037) += superio.c diff --git a/src/superio/smsc/sch4037/sch4037.h b/src/superio/smsc/sch4037/sch4037.h index d065489..23f1e1e 100644 --- a/src/superio/smsc/sch4037/sch4037.h +++ b/src/superio/smsc/sch4037/sch4037.h @@ -20,7 +20,6 @@ #ifndef SUPERIO_SCH_4037_H #define SUPERIO_SCH_4037_H - #define SCH4037_FDD 0 /* FDD */ #define SCH4037_LPT 3 /* LPT */ #define SMSCSUPERIO_SP1 4 /* Com1 */ @@ -31,4 +30,6 @@ #define SCH4037_RUNTIME 0x0A /* Runtime */ #define SCH4037_XBUS 0x0B /* X-BUS */ -#endif //SUPERIO_SCH_4037_H +void sch4037_early_init(unsigned port); + +#endif /* SUPERIO_SCH_4037_H */ diff --git a/src/superio/smsc/sch4037/sch4037_early_init.c b/src/superio/smsc/sch4037/sch4037_early_init.c index 29517ed..0beacd0 100644 --- a/src/superio/smsc/sch4037/sch4037_early_init.c +++ b/src/superio/smsc/sch4037/sch4037_early_init.c @@ -33,7 +33,7 @@ static void pnp_exit_conf_state(device_t dev) outb(0xaa, port); } -static inline void sch4037_early_init(unsigned port) +void sch4037_early_init(unsigned port) { device_t dev; diff --git a/src/superio/smsc/sch4037/superio.c b/src/superio/smsc/sch4037/superio.c index 35df431..ad8d8b4 100644 --- a/src/superio/smsc/sch4037/superio.c +++ b/src/superio/smsc/sch4037/superio.c @@ -24,20 +24,23 @@ #include <device/pnp.h> #include <superio/conf_mode.h> #include <console/console.h> -#include <device/smbus.h> -#include <string.h> #include <pc80/keyboard.h> #include <stdlib.h> + #include "sch4037.h" -/* Forward declarations */ -static void enable_dev(device_t dev); -static void sch4037_init(device_t dev); +static void sch4037_init(device_t dev) +{ + if (!dev->enabled) { + return; + } -struct chip_operations superio_smsc_sch4037_ops = { - CHIP_NAME("SMSC SCH4037 Super I/O") - .enable_dev = enable_dev, -}; + switch(dev->path.pnp.device) { + case SCH4037_KBC: + pc_keyboard_init(); + break; + } +} static struct device_operations ops = { .read_resources = pnp_read_resources, @@ -54,24 +57,10 @@ static struct pnp_info pnp_dev_info[] = { static void enable_dev(device_t dev) { - printk(BIOS_SPEW, "file '%s',line %d, %s()\n", __FILE__, __LINE__, __func__); pnp_enable_devices(dev, &pnp_ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); } -static void sch4037_init(device_t dev) -{ - struct resource *res0, *res1; - - if (!dev->enabled) { - return; - } - - switch(dev->path.pnp.device) { - - case SCH4037_KBC: - res0 = find_resource(dev, PNP_IDX_IO0); - res1 = find_resource(dev, PNP_IDX_IO1); - pc_keyboard_init(); - break; - } -} +struct chip_operations superio_smsc_sch4037_ops = { + CHIP_NAME("SMSC SCH4037 Super I/O") + .enable_dev = enable_dev, +};

1 0

New patch to review for coreboot: ecf235a i945G 'raminit.c' fix command_clock_crossing value for DDR667-FSB800
by HAOUAS Elyes 06 Aug '14

06 Aug '14

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6508 -gerrit commit ecf235afd3ed2e1cabee22d1426c048c26684bab Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Wed Aug 6 12:35:41 2014 +0200 i945G 'raminit.c' fix command_clock_crossing value for DDR667-FSB800 Change-Id: Ia5e1d9131e3353943b55fc58991ed50128f8aa8c Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- src/northbridge/intel/i945/raminit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/northbridge/intel/i945/raminit.c b/src/northbridge/intel/i945/raminit.c index e823bab..ca8bf75 100644 --- a/src/northbridge/intel/i945/raminit.c +++ b/src/northbridge/intel/i945/raminit.c @@ -2264,7 +2264,7 @@ static void sdram_program_clock_crossing(void) 0x02010804, 0x00000000, /* DDR400 FSB800 */ 0x00010402, 0x00000000, /* DDR533 FSB800 */ - 0x04020180, 0x00000008, /* DDR667 FSB800 */ + 0x04020130, 0x00000008, /* DDR667 FSB800 */ 0x00020904, 0x00000000, /* DDR400 FSB1066 */ 0x02010804, 0x00000000, /* DDR533 FSB1066 */

1 0

Patch set updated for coreboot: adf28c0 Delete trailing blank lines at end of file
by HAOUAS Elyes 06 Aug '14

06 Aug '14

HAOUAS Elyes (ehaouas(a)noos.fr) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6385 -gerrit commit adf28c0583593578bd746b9e2e1035af7473946c Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Wed Aug 6 09:26:40 2014 +0200 Delete trailing blank lines at end of file Change-Id: Id347177cbf531277c04455cd818ab4c121cbd03c Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- documentation/Makefile | 1 - documentation/POSTCODES | 1 - documentation/RFC/config.tex | 1 - payloads/bayou/Makefile | 1 - payloads/bayou/bayou.xml.example | 1 - payloads/bayou/nrv2b.c | 1 - payloads/bayou/util/pbuilder/Makefile | 1 - payloads/bayou/util/pbuilder/lzma/C/7zip/Compress/LZ/HashChain/HC4.h | 1 - .../bayou/util/pbuilder/lzma/C/7zip/Compress/LZ/HashChain/HCMain.h | 1 - payloads/bayou/util/pbuilder/lzma/Makefile | 1 - payloads/bayou/util/pbuilder/lzma/minilzma.cc | 1 - payloads/coreinfo/Kconfig | 1 - payloads/coreinfo/Makefile | 1 - payloads/coreinfo/README | 1 - payloads/coreinfo/util/kconfig/Makefile | 1 - payloads/coreinfo/util/kconfig/check.sh | 1 - payloads/coreinfo/util/kconfig/lex.zconf.c_shipped | 1 - payloads/coreinfo/util/kconfig/util.c | 1 - payloads/coreinfo/util/kconfig/zconf.hash.c_shipped | 1 - payloads/coreinfo/util/kconfig/zconf.tab.c_shipped | 1 - payloads/external/FILO/Makefile.inc | 1 - payloads/external/tint/README | 1 - payloads/libpayload/LICENSES | 1 - payloads/libpayload/Makefile.inc | 1 - payloads/libpayload/README | 1 - payloads/libpayload/arch/armv7/exception_asm.S | 1 - payloads/libpayload/arch/x86/exec.S | 1 - payloads/libpayload/curses/Makefile.inc | 1 - payloads/libpayload/curses/PDCurses-3.4/doc/intro.txt | 1 - payloads/libpayload/curses/PDCurses-3.4/x11/sb.c | 1 - payloads/libpayload/curses/keyboard.c | 1 - payloads/libpayload/curses/pdcurses-backend/nc_alloc.h | 1 - payloads/libpayload/curses/pdcurses-backend/pdcdisp.c | 1 - payloads/libpayload/curses/pdcurses-backend/pdcutil.c | 1 - payloads/libpayload/drivers/hid.c | 2 -- payloads/libpayload/drivers/nvram.c | 2 -- payloads/libpayload/drivers/pci.c | 1 - payloads/libpayload/drivers/usb/ohci.c | 1 - payloads/libpayload/drivers/usb/quirks.c | 1 - payloads/libpayload/drivers/usb/usbhid.c | 1 - payloads/libpayload/drivers/video/corebootfb.c | 1 - payloads/libpayload/drivers/video/video.c | 1 - payloads/libpayload/include/cbfs.h | 1 - payloads/libpayload/include/stddef.h | 1 - payloads/libpayload/include/sysinfo.h | 1 - payloads/libpayload/libc/ctype.c | 1 - payloads/libpayload/libc/lib.c | 1 - payloads/libpayload/libc/memory.c | 1 - payloads/libpayload/libcbfs/Makefile.inc | 1 - payloads/libpayload/libcbfs/cbfs_core.c | 1 - payloads/libpayload/liblzma/Makefile.inc | 1 - payloads/libpayload/libpci/libpci.c | 1 - payloads/libpayload/sample/Makefile | 1 - payloads/libpayload/tests/Makefile | 1 - payloads/libpayload/util/kconfig/Makefile | 1 - payloads/libpayload/util/kconfig/check.sh | 1 - payloads/libpayload/util/kconfig/lex.zconf.c_shipped | 1 - payloads/libpayload/util/kconfig/util.c | 1 - payloads/libpayload/util/kconfig/zconf.hash.c_shipped | 1 - payloads/libpayload/util/kconfig/zconf.tab.c_shipped | 1 - payloads/nvramcui/nvramcui.c | 1 - payloads/tianocoreboot/Makefile | 1 - payloads/tianocoreboot/README | 1 - payloads/tianocoreboot/include/PiFirmwareFile.h | 1 - payloads/tianocoreboot/include/coff.h | 1 - payloads/tianocoreboot/include/efi.h | 1 - src/arch/armv7/exception_asm.S | 1 - src/arch/x86/boot/wakeup.S | 1 - src/arch/x86/init/crt0_romcc_epilogue.inc | 1 - src/arch/x86/init/prologue.inc | 1 - src/cpu/amd/agesa/Kconfig | 1 - src/cpu/amd/geode_lx/cache_as_ram.inc | 1 - src/cpu/amd/model_fxx/microcode_rev_c.h | 2 -- src/cpu/amd/model_fxx/microcode_rev_d.h | 2 -- src/cpu/amd/model_fxx/microcode_rev_e.h | 2 -- src/cpu/amd/socket_939/Kconfig | 1 - src/cpu/amd/socket_AM2/Kconfig | 1 - src/cpu/amd/socket_F/Kconfig | 1 - src/cpu/intel/car/cache_as_ram.inc | 1 - src/cpu/intel/car/cache_as_ram_ht.inc | 1 - src/cpu/intel/fit/Kconfig | 1 - src/cpu/intel/haswell/cache_as_ram.inc | 1 - src/cpu/intel/microcode/update-microcodes.sh | 1 - src/cpu/intel/model_106cx/Kconfig | 1 - src/cpu/intel/model_2065x/cache_as_ram.inc | 1 - src/cpu/intel/model_206ax/cache_as_ram.inc | 1 - src/cpu/intel/model_6ex/cache_as_ram.inc | 1 - src/cpu/intel/slot_2/Kconfig | 1 - src/cpu/intel/socket_PGA370/Kconfig | 1 - src/cpu/intel/socket_mPGA604/Kconfig | 1 - src/cpu/samsung/exynos5420/smp.c | 1 - src/cpu/via/car/cache_as_ram.inc | 1 - src/cpu/x86/16bit/entry16.inc | 1 - src/cpu/x86/32bit/entry32.inc | 1 - src/cpu/x86/smm/smm_stub.S | 1 - src/cpu/x86/smm/smmhandler.S | 1 - src/cpu/x86/sse_enable.inc | 1 - src/device/oprom/x86emu/LICENSE | 1 - src/drivers/emulation/Kconfig | 1 - src/drivers/intel/fsp/cache_as_ram.inc | 1 - src/drivers/sil/3114/Kconfig | 2 -- src/drivers/sil/Kconfig | 2 -- src/drivers/trident/Kconfig | 1 - src/include/cbfs.h | 1 - src/include/cpu/amd/gx1def.h | 1 - src/include/cpu/amd/microcode.h | 1 - src/include/cpu/amd/model_fxx_rev.h | 1 - src/include/cpu/x86/name.h | 1 - src/include/device/i915.h | 2 -- src/include/romstage_handoff.h | 1 - src/mainboard/aaeon/pfm-540i_revb/devicetree.cb | 1 - src/mainboard/amd/db800/devicetree.cb | 1 - src/mainboard/amd/dbm690t/devicetree.cb | 1 - src/mainboard/amd/dinar/devicetree.cb | 1 - src/mainboard/amd/inagua/Kconfig | 1 - src/mainboard/amd/inagua/devicetree.cb | 1 - src/mainboard/amd/norwich/devicetree.cb | 1 - src/mainboard/amd/pistachio/devicetree.cb | 1 - src/mainboard/amd/rumba/devicetree.cb | 1 - src/mainboard/amd/serengeti_cheetah/devicetree.cb | 2 -- src/mainboard/amd/serengeti_cheetah/readme_acpi.txt | 1 - src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb | 2 -- src/mainboard/amd/south_station/Kconfig | 1 - src/mainboard/amd/south_station/devicetree.cb | 1 - src/mainboard/amd/torpedo/Kconfig | 1 - src/mainboard/amd/torpedo/devicetree.cb | 1 - src/mainboard/amd/union_station/Kconfig | 1 - src/mainboard/amd/union_station/devicetree.cb | 1 - src/mainboard/arima/hdama/devicetree.cb | 1 - src/mainboard/artecgroup/dbe61/devicetree.cb | 1 - src/mainboard/asi/mb_5blmp/devicetree.cb | 1 - src/mainboard/asrock/939a785gmh/devicetree.cb | 1 - src/mainboard/asrock/e350m1/Kconfig | 1 - src/mainboard/asus/mew-vm/devicetree.cb | 1 - src/mainboard/broadcom/blast/devicetree.cb | 1 - src/mainboard/cubietech/cubieboard/board_info.txt | 1 - src/mainboard/digitallogic/msm800sev/devicetree.cb | 1 - src/mainboard/eaglelion/5bcm/devicetree.cb | 1 - src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc | 1 - src/mainboard/hp/dl145_g1/devicetree.cb | 1 - src/mainboard/hp/dl145_g3/devicetree.cb | 2 -- src/mainboard/hp/dl165_g6_fam10/devicetree.cb | 2 -- src/mainboard/hp/e_vectra_p2706t/devicetree.cb | 1 - src/mainboard/ibm/e325/devicetree.cb | 1 - src/mainboard/ibm/e326/devicetree.cb | 1 - src/mainboard/iei/juki-511p/devicetree.cb | 1 - src/mainboard/iei/kino-780am2-fam10/devicetree.cb | 1 - src/mainboard/iei/nova4899r/devicetree.cb | 1 - src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb | 1 - src/mainboard/intel/eagleheights/devicetree.cb | 1 - src/mainboard/intel/mohonpeak/acpi/platform.asl | 1 - src/mainboard/intel/mohonpeak/cmos.layout | 2 -- src/mainboard/intel/mohonpeak/irq_tables.c | 1 - src/mainboard/intel/mohonpeak/mainboard.c | 1 - src/mainboard/iwave/iWRainbowG6/devicetree.cb | 1 - src/mainboard/iwill/dk8_htx/devicetree.cb | 2 -- src/mainboard/iwill/dk8s2/devicetree.cb | 1 - src/mainboard/iwill/dk8x/devicetree.cb | 1 - src/mainboard/kontron/kt690/devicetree.cb | 1 - src/mainboard/lippert/frontrunner/devicetree.cb | 1 - src/mainboard/msi/ms6178/devicetree.cb | 1 - src/mainboard/msi/ms9185/devicetree.cb | 2 -- src/mainboard/nec/powermate2000/devicetree.cb | 1 - src/mainboard/newisys/khepri/devicetree.cb | 1 - src/mainboard/pcengines/alix1c/devicetree.cb | 1 - src/mainboard/pcengines/alix2d/devicetree.cb | 1 - src/mainboard/pcengines/alix6/board_info.txt | 1 - src/mainboard/rca/rm4100/devicetree.cb | 1 - src/mainboard/siemens/sitemp_g1p1/devicetree.cb | 1 - src/mainboard/supermicro/h8dmr_fam10/README | 1 - src/mainboard/supermicro/h8qgi/Kconfig | 1 - src/mainboard/supermicro/h8qgi/devicetree.cb | 1 - src/mainboard/supermicro/h8scm/devicetree.cb | 1 - src/mainboard/supermicro/h8scm_fam10/devicetree.cb | 2 -- src/mainboard/supermicro/x6dai_g/devicetree.cb | 1 - src/mainboard/supermicro/x6dhr_ig/devicetree.cb | 1 - src/mainboard/supermicro/x6dhr_ig2/devicetree.cb | 1 - src/mainboard/technexion/tim5690/devicetree.cb | 1 - src/mainboard/technexion/tim8690/devicetree.cb | 1 - src/mainboard/tyan/s2735/devicetree.cb | 1 - src/mainboard/tyan/s2850/devicetree.cb | 1 - src/mainboard/tyan/s2875/devicetree.cb | 1 - src/mainboard/tyan/s2880/devicetree.cb | 1 - src/mainboard/tyan/s2881/devicetree.cb | 1 - src/mainboard/tyan/s2882/devicetree.cb | 1 - src/mainboard/tyan/s2885/devicetree.cb | 1 - src/mainboard/tyan/s4880/devicetree.cb | 1 - src/mainboard/tyan/s4882/devicetree.cb | 1 - src/mainboard/tyan/s8226/devicetree.cb | 1 - src/mainboard/via/vt8454c/Kconfig | 1 - src/mainboard/via/vt8454c/devicetree.cb | 1 - src/mainboard/winent/pl6064/devicetree.cb | 1 - src/mainboard/wyse/s50/devicetree.cb | 1 - src/northbridge/amd/gx1/Kconfig | 1 - src/northbridge/intel/e7501/Kconfig | 1 - src/northbridge/intel/i440bx/Kconfig | 1 - src/northbridge/intel/i440lx/Kconfig | 1 - src/northbridge/intel/i82810/Kconfig | 1 - src/northbridge/intel/i82830/Kconfig | 1 - src/northbridge/via/cn400/Kconfig | 1 - src/northbridge/via/cn700/Kconfig | 1 - src/northbridge/via/vt8601/Kconfig | 1 - src/northbridge/via/vt8623/Kconfig | 1 - src/northbridge/via/vx800/Kconfig | 1 - src/soc/intel/baytrail/romstage/cache_as_ram.inc | 1 - src/soc/nvidia/tegra124/timer.c | 1 - src/southbridge/amd/amd8131/Kconfig | 1 - src/southbridge/amd/cimx/sb700/Kconfig | 1 - src/southbridge/amd/cimx/sb800/Kconfig | 1 - src/southbridge/amd/cimx/sb900/Kconfig | 1 - src/southbridge/amd/cs5530/Kconfig | 1 - src/southbridge/amd/cs5536/Kconfig | 1 - src/southbridge/amd/rs780/Kconfig | 1 - src/southbridge/intel/i3100/Kconfig | 1 - src/southbridge/intel/i82371eb/Kconfig | 1 - src/southbridge/intel/i82801ax/Kconfig | 1 - src/southbridge/intel/i82801bx/Kconfig | 1 - src/southbridge/intel/i82801gx/Kconfig | 1 - src/southbridge/intel/i82801ix/Kconfig | 1 - src/southbridge/intel/sch/Kconfig | 1 - src/southbridge/ricoh/rl5c476/Kconfig | 1 - src/southbridge/sis/sis966/Kconfig | 1 - src/southbridge/ti/pci7420/Kconfig | 1 - src/southbridge/ti/pcixx12/Kconfig | 1 - src/southbridge/via/vt8235/Kconfig | 1 - util/acpi/acpidump-all | 1 - util/amdtools/README | 1 - util/amdtools/example_input/lspci-cb-48G-667MHz-18.2-20090909e | 1 - util/amdtools/k8-compare-pci-space.pl | 1 - util/amdtools/k8-interpret-extended-memory-settings.pl | 1 - util/amdtools/k8-read-mem-settings.sh | 1 - util/board_status/to-wiki/bucketize.sh | 1 - util/cbfstool/cbfs-mkpayload.c | 1 - util/cbfstool/cbfs-payload-linux.c | 2 -- util/cbfstool/coff.h | 1 - util/cbfstool/linux.h | 1 - util/crossgcc/README | 2 -- util/crossgcc/buildgcc | 2 -- util/getpir/Makefile | 1 - util/getpir/README | 1 - util/i915tool/plusplusplus | 1 - util/i915tool/spatches/drm_crtc.cocci | 1 - util/i915tool/spatches/fx.cocci | 1 - util/i915tool/spatches/i915_drv.cocci | 1 - util/ifdtool/Makefile | 1 - util/inteltool/Makefile | 1 - util/inteltool/amb.c | 2 -- util/inteltool/memory.c | 2 -- util/k8resdump/Makefile | 1 - util/kconfig/check.sh | 1 - util/kconfig/mconf.c | 1 - util/kconfig/nconf.c | 1 - util/kconfig/util.c | 2 -- util/kconfig/zconf.hash.c_shipped | 1 - util/kconfig/zconf.lex.c_shipped | 1 - util/kconfig/zconf.tab.c_shipped | 1 - util/lbtdump/Makefile | 2 -- util/lbtdump/README | 1 - util/lint/lint-stable-002-build-dir-handling | 1 - util/lint/lint-stable-003-whitespace | 1 - util/mkelfImage/configure | 3 --- util/mkelfImage/configure.ac | 2 -- util/mkelfImage/kunzip_src/arch/alpha/lib/Makefile | 2 -- util/mkelfImage/kunzip_src/lib/inflate.c | 2 -- util/mkelfImage/linux-i386/Makefile | 1 - util/mkelfImage/linux-i386/convert_params.c | 1 - util/mkelfImage/linux-i386/mkelf-linux-i386.c | 1 - util/mkelfImage/linux-ia64/Makefile | 1 - util/mkelfImage/linux-ia64/convert.bin.c | 1 - util/mkelfImage/mkelfImage.spec.in | 1 - util/msrtool/intel_atom.c | 1 - util/msrtool/intel_core2_later.c | 2 -- util/msrtool/intel_nehalem.c | 2 -- util/msrtool/intel_pentium4_later.c | 1 - util/nvramtool/Makefile.inc | 2 -- util/nvramtool/accessors/cmos-hw-unix.c | 1 - util/nvramtool/accessors/cmos-mem.c | 1 - util/nvramtool/accessors/layout-bin.c | 1 - util/nvramtool/cbfs.c | 1 - util/nvramtool/cbfs.h | 1 - util/nvramtool/hexdump.c | 1 - util/nvramtool/lbtable.c | 1 - util/nvramtool/reg_expr.c | 1 - util/optionlist/Makefile | 1 - util/romcc/Makefile | 1 - util/romcc/tests.sh | 2 -- util/romcc/tests/fail_test10.c | 1 - util/romcc/tests/fail_test11.c | 1 - util/romcc/tests/fail_test9.c | 1 - util/romcc/tests/simple_test10.c | 1 - util/romcc/tests/simple_test12.c | 1 - util/romcc/tests/simple_test17.c | 1 - util/romcc/tests/simple_test33.c | 2 -- util/romcc/tests/simple_test47.c | 1 - util/romcc/tests/simple_test5.c | 1 - util/romcc/tests/simple_test72.c | 1 - util/romcc/tests/simple_test80.c | 1 - util/romcc/tests/simple_test82.c | 1 - util/sconfig/lex.yy.c_shipped | 1 - util/sconfig/sconfig.tab.c_shipped | 5 ----- util/sconfig/sconfig.tab.h_shipped | 2 -- util/superiotool/Makefile | 1 - util/vgabios/Makefile | 1 - util/vgabios/testbios.c | 1 - util/viatool/Makefile | 1 - util/viatool/quirks/quirks.h | 1 - util/xcompile/xcompile | 1 - 307 files changed, 345 deletions(-) diff --git a/documentation/Makefile b/documentation/Makefile index 1e00444..96b66a9 100644 --- a/documentation/Makefile +++ b/documentation/Makefile @@ -68,4 +68,3 @@ clean: distclean: clean rm -f CorebootPortingGuide.pdf Kconfig.pdf - diff --git a/documentation/POSTCODES b/documentation/POSTCODES index 85ad4d7..5d337b6 100644 --- a/documentation/POSTCODES +++ b/documentation/POSTCODES @@ -23,4 +23,3 @@ Errors (used in several places): 0xee Not supposed to get here 0xff Elfload fail or die() called - diff --git a/documentation/RFC/config.tex b/documentation/RFC/config.tex index 6d6c433..696ab7a 100644 --- a/documentation/RFC/config.tex +++ b/documentation/RFC/config.tex @@ -288,4 +288,3 @@ export CC:=$(CONFIG_CROSS_COMPILE)gcc In other words, instead of expressions, we see the values. It's easier to deal with. - diff --git a/payloads/bayou/Makefile b/payloads/bayou/Makefile index 0280ef5..d8bb80c 100644 --- a/payloads/bayou/Makefile +++ b/payloads/bayou/Makefile @@ -69,4 +69,3 @@ util/pbuilder/pbuilder: clean: rm -f *.o bayou.elf builtin.lar $(MAKE) -C util/pbuilder clean - diff --git a/payloads/bayou/bayou.xml.example b/payloads/bayou/bayou.xml.example index 53dfd52..4873864 100644 --- a/payloads/bayou/bayou.xml.example +++ b/payloads/bayou/bayou.xml.example @@ -39,4 +39,3 @@ </payload> </payloads> </BayouConfig> - diff --git a/payloads/bayou/nrv2b.c b/payloads/bayou/nrv2b.c index dbfb91a..53f7988 100644 --- a/payloads/bayou/nrv2b.c +++ b/payloads/bayou/nrv2b.c @@ -84,4 +84,3 @@ unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p) return olen; } - diff --git a/payloads/bayou/util/pbuilder/Makefile b/payloads/bayou/util/pbuilder/Makefile index fe850ba..d3cd217 100644 --- a/payloads/bayou/util/pbuilder/Makefile +++ b/payloads/bayou/util/pbuilder/Makefile @@ -65,4 +65,3 @@ liblar/liblar.a: clean: rm -f pbuilder *.o lzma/*.o $(MAKE) -C liblar clean - diff --git a/payloads/bayou/util/pbuilder/lzma/C/7zip/Compress/LZ/HashChain/HC4.h b/payloads/bayou/util/pbuilder/lzma/C/7zip/Compress/LZ/HashChain/HC4.h index 1fda4ac..ba97be2 100644 --- a/payloads/bayou/util/pbuilder/lzma/C/7zip/Compress/LZ/HashChain/HC4.h +++ b/payloads/bayou/util/pbuilder/lzma/C/7zip/Compress/LZ/HashChain/HC4.h @@ -16,4 +16,3 @@ #undef BT_NAMESPACE #endif - diff --git a/payloads/bayou/util/pbuilder/lzma/C/7zip/Compress/LZ/HashChain/HCMain.h b/payloads/bayou/util/pbuilder/lzma/C/7zip/Compress/LZ/HashChain/HCMain.h index d509bef..9c075ce 100644 --- a/payloads/bayou/util/pbuilder/lzma/C/7zip/Compress/LZ/HashChain/HCMain.h +++ b/payloads/bayou/util/pbuilder/lzma/C/7zip/Compress/LZ/HashChain/HCMain.h @@ -3,4 +3,3 @@ #define _HASH_CHAIN #include "../BinTree/BinTreeMain.h" #undef _HASH_CHAIN - diff --git a/payloads/bayou/util/pbuilder/lzma/Makefile b/payloads/bayou/util/pbuilder/lzma/Makefile index 6c2ecd7..82bd2b4 100644 --- a/payloads/bayou/util/pbuilder/lzma/Makefile +++ b/payloads/bayou/util/pbuilder/lzma/Makefile @@ -60,4 +60,3 @@ $(obj)/util/lzma/%.o: $(src)/util/lzma/C/Common/%.cpp $(obj)/util/lzma/%.o: $(src)/util/lzma/%.cc $(Q)printf " HOSTCXX $(subst $(shell pwd)/,,$(@))\n" $(Q)$(HOSTCXX) $(HOSTCXXFLAGS) -o $@ -c $< - diff --git a/payloads/bayou/util/pbuilder/lzma/minilzma.cc b/payloads/bayou/util/pbuilder/lzma/minilzma.cc index 441c288..f5509e2 100644 --- a/payloads/bayou/util/pbuilder/lzma/minilzma.cc +++ b/payloads/bayou/util/pbuilder/lzma/minilzma.cc @@ -315,4 +315,3 @@ void do_lzma_uncompress(char *dst, int dst_len, char *src, int src_len) { } #endif - diff --git a/payloads/coreinfo/Kconfig b/payloads/coreinfo/Kconfig index d783bda..cec061e 100644 --- a/payloads/coreinfo/Kconfig +++ b/payloads/coreinfo/Kconfig @@ -115,4 +115,3 @@ config MODULE_CBFS This option will increase the ELF file size by ca. 1440 bytes. endmenu - diff --git a/payloads/coreinfo/Makefile b/payloads/coreinfo/Makefile index 3a2aa9c..6d27360 100644 --- a/payloads/coreinfo/Makefile +++ b/payloads/coreinfo/Makefile @@ -108,4 +108,3 @@ distclean: clean include util/kconfig/Makefile .PHONY: $(PHONY) prepare clean distclean - diff --git a/payloads/coreinfo/README b/payloads/coreinfo/README index 0c41452..f41c968 100644 --- a/payloads/coreinfo/README +++ b/payloads/coreinfo/README @@ -24,4 +24,3 @@ Then you can build coreinfo now: $ make menuconfig $ make - diff --git a/payloads/coreinfo/util/kconfig/Makefile b/payloads/coreinfo/util/kconfig/Makefile index 679ab92..9c99499 100644 --- a/payloads/coreinfo/util/kconfig/Makefile +++ b/payloads/coreinfo/util/kconfig/Makefile @@ -334,4 +334,3 @@ $(objk)/lxdialog/lxdialog: $(objk)/dochecklxdialog \ $(patsubst %,$(objk)/lxdialog/%,$(lxdialog)) $(HOST_LOADLIBES) -o $@ $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@ - diff --git a/payloads/coreinfo/util/kconfig/check.sh b/payloads/coreinfo/util/kconfig/check.sh index fa59cbf..15fc294 100755 --- a/payloads/coreinfo/util/kconfig/check.sh +++ b/payloads/coreinfo/util/kconfig/check.sh @@ -11,4 +11,3 @@ EOF if [ ! "$?" -eq "0" ]; then echo -DKBUILD_NO_NLS; fi - diff --git a/payloads/coreinfo/util/kconfig/lex.zconf.c_shipped b/payloads/coreinfo/util/kconfig/lex.zconf.c_shipped index 6897092..b01e35a 100644 --- a/payloads/coreinfo/util/kconfig/lex.zconf.c_shipped +++ b/payloads/coreinfo/util/kconfig/lex.zconf.c_shipped @@ -2371,4 +2371,3 @@ char *zconf_curname(void) { return current_pos.file ? current_pos.file->name : "<none>"; } - diff --git a/payloads/coreinfo/util/kconfig/util.c b/payloads/coreinfo/util/kconfig/util.c index a47d5e0..24c631f 100644 --- a/payloads/coreinfo/util/kconfig/util.c +++ b/payloads/coreinfo/util/kconfig/util.c @@ -130,4 +130,3 @@ const char *str_get(struct gstr *gs) { return gs->s; } - diff --git a/payloads/coreinfo/util/kconfig/zconf.hash.c_shipped b/payloads/coreinfo/util/kconfig/zconf.hash.c_shipped index 5c73d51..3a36ca8 100644 --- a/payloads/coreinfo/util/kconfig/zconf.hash.c_shipped +++ b/payloads/coreinfo/util/kconfig/zconf.hash.c_shipped @@ -234,4 +234,3 @@ kconf_id_lookup (register const char *str, register unsigned int len) } return 0; } - diff --git a/payloads/coreinfo/util/kconfig/zconf.tab.c_shipped b/payloads/coreinfo/util/kconfig/zconf.tab.c_shipped index bdd5ffd..638b81d 100644 --- a/payloads/coreinfo/util/kconfig/zconf.tab.c_shipped +++ b/payloads/coreinfo/util/kconfig/zconf.tab.c_shipped @@ -2476,4 +2476,3 @@ void zconfdump(FILE *out) #include "expr.c" #include "symbol.c" #include "menu.c" - diff --git a/payloads/external/FILO/Makefile.inc b/payloads/external/FILO/Makefile.inc index d298d1d..6a96a22 100644 --- a/payloads/external/FILO/Makefile.inc +++ b/payloads/external/FILO/Makefile.inc @@ -47,4 +47,3 @@ distclean: rm -rf filo .PHONY: checkout config filo clean distclean - diff --git a/payloads/external/tint/README b/payloads/external/tint/README index 2b9a1c4..45a015d 100644 --- a/payloads/external/tint/README +++ b/payloads/external/tint/README @@ -6,4 +6,3 @@ For instructions on how to download, patch, and build tint as a coreboot payload, please see http://www.coreboot.org/Tint - diff --git a/payloads/libpayload/LICENSES b/payloads/libpayload/LICENSES index 4938892..ffea64c 100644 --- a/payloads/libpayload/LICENSES +++ b/payloads/libpayload/LICENSES @@ -109,4 +109,3 @@ holders, and the exact license terms that apply. http://www.openbsd.org/cgi-bin/cvsweb/src/lib/libc/hash/sha1.c Original files: src/lib/libc/hash/sha1.c Current version we use: CVS revision 1.20 2005/08/08 - diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index a5de4b3..17e2c21 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -138,4 +138,3 @@ junit.xml: done echo "</testsuite>" >> $@.tmp mv $@.tmp $@ - diff --git a/payloads/libpayload/README b/payloads/libpayload/README index 70bd5ef..0f905cb 100644 --- a/payloads/libpayload/README +++ b/payloads/libpayload/README @@ -63,4 +63,3 @@ Copyright and License --------------------- See LICENSES. - diff --git a/payloads/libpayload/arch/armv7/exception_asm.S b/payloads/libpayload/arch/armv7/exception_asm.S index e46f4bc..a735db9 100644 --- a/payloads/libpayload/arch/armv7/exception_asm.S +++ b/payloads/libpayload/arch/armv7/exception_asm.S @@ -112,4 +112,3 @@ exception_test: add r0, $3 ldr r1, [r1] bx lr - diff --git a/payloads/libpayload/arch/x86/exec.S b/payloads/libpayload/arch/x86/exec.S index 9a44196..b632a55 100644 --- a/payloads/libpayload/arch/x86/exec.S +++ b/payloads/libpayload/arch/x86/exec.S @@ -96,4 +96,3 @@ i386_do_exec: movl %ebp,%esp popl %ebp ret - diff --git a/payloads/libpayload/curses/Makefile.inc b/payloads/libpayload/curses/Makefile.inc index 025a051..290abc4 100644 --- a/payloads/libpayload/curses/Makefile.inc +++ b/payloads/libpayload/curses/Makefile.inc @@ -165,4 +165,3 @@ libform-$(CONFIG_LP_PDCURSES) += form/fld_opts.c libform-$(CONFIG_LP_PDCURSES) += form/fld_attr.c libform-$(CONFIG_LP_PDCURSES) += form/fld_dup.c libform-$(CONFIG_LP_PDCURSES) += form/fld_just.c - diff --git a/payloads/libpayload/curses/PDCurses-3.4/doc/intro.txt b/payloads/libpayload/curses/PDCurses-3.4/doc/intro.txt index a13cb7a..b54dcf0 100644 --- a/payloads/libpayload/curses/PDCurses-3.4/doc/intro.txt +++ b/payloads/libpayload/curses/PDCurses-3.4/doc/intro.txt @@ -831,4 +831,3 @@ Functions specific to the X11 port of PDCurses: sb_refresh sb -------------------------------------------------------------------------- - diff --git a/payloads/libpayload/curses/PDCurses-3.4/x11/sb.c b/payloads/libpayload/curses/PDCurses-3.4/x11/sb.c index a34f502..95b0292 100644 --- a/payloads/libpayload/curses/PDCurses-3.4/x11/sb.c +++ b/payloads/libpayload/curses/PDCurses-3.4/x11/sb.c @@ -150,4 +150,3 @@ int sb_refresh(void) return OK; } - diff --git a/payloads/libpayload/curses/keyboard.c b/payloads/libpayload/curses/keyboard.c index 927e06f..315653b 100644 --- a/payloads/libpayload/curses/keyboard.c +++ b/payloads/libpayload/curses/keyboard.c @@ -261,4 +261,3 @@ int curses_serial_enabled(void) void curses_enable_serial(int state) { } int curses_serial_enabled(void) { return 0; } #endif - diff --git a/payloads/libpayload/curses/pdcurses-backend/nc_alloc.h b/payloads/libpayload/curses/pdcurses-backend/nc_alloc.h index 95d41f9..25b5161 100644 --- a/payloads/libpayload/curses/pdcurses-backend/nc_alloc.h +++ b/payloads/libpayload/curses/pdcurses-backend/nc_alloc.h @@ -1,4 +1,3 @@ #define typeMalloc(type,elts) (type *)malloc((elts)*sizeof(type)) #define typeCalloc(type,elts) (type *)calloc((elts),sizeof(type)) #define typeRealloc(type,elts,ptr) (type *)_nc_doalloc(ptr, (elts)*sizeof(type)) - diff --git a/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c b/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c index 308370e..6b13b27 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdcdisp.c @@ -244,4 +244,3 @@ void PDC_transform_line(int lineno, int x, int len, const chtype *srcp) #endif } } - diff --git a/payloads/libpayload/curses/pdcurses-backend/pdcutil.c b/payloads/libpayload/curses/pdcurses-backend/pdcutil.c index c40e2ed..70853dc 100644 --- a/payloads/libpayload/curses/pdcurses-backend/pdcutil.c +++ b/payloads/libpayload/curses/pdcurses-backend/pdcutil.c @@ -47,4 +47,3 @@ int curses_vga_enabled(void) { return !!(curses_flags & F_ENABLE_CONSOLE); } - diff --git a/payloads/libpayload/drivers/hid.c b/payloads/libpayload/drivers/hid.c index 60b4856..f5dbe39 100644 --- a/payloads/libpayload/drivers/hid.c +++ b/payloads/libpayload/drivers/hid.c @@ -38,5 +38,3 @@ int add_reset_handler(void (*new_handler)(void)) return 0; } - - diff --git a/payloads/libpayload/drivers/nvram.c b/payloads/libpayload/drivers/nvram.c index a046c8e..ca689b7 100644 --- a/payloads/libpayload/drivers/nvram.c +++ b/payloads/libpayload/drivers/nvram.c @@ -131,5 +131,3 @@ void rtc_read_clock(struct tm *time) if (time->tm_year < 80) time->tm_year += 100; } - - diff --git a/payloads/libpayload/drivers/pci.c b/payloads/libpayload/drivers/pci.c index 31b29f8..3a9bdcd 100644 --- a/payloads/libpayload/drivers/pci.c +++ b/payloads/libpayload/drivers/pci.c @@ -128,4 +128,3 @@ void pci_set_bus_master(pcidev_t dev) val |= REG_COMMAND_BM; pci_write_config16(dev, REG_COMMAND, val); } - diff --git a/payloads/libpayload/drivers/usb/ohci.c b/payloads/libpayload/drivers/usb/ohci.c index 0683de3..02a9583 100644 --- a/payloads/libpayload/drivers/usb/ohci.c +++ b/payloads/libpayload/drivers/usb/ohci.c @@ -865,4 +865,3 @@ ohci_process_done_queue(ohci_t *const ohci, const int spew_debug) if (spew_debug) usb_debug("processed %d done tds, %d intr tds thereof.\n", i, j); } - diff --git a/payloads/libpayload/drivers/usb/quirks.c b/payloads/libpayload/drivers/usb/quirks.c index a8f2622..8577f94 100644 --- a/payloads/libpayload/drivers/usb/quirks.c +++ b/payloads/libpayload/drivers/usb/quirks.c @@ -85,4 +85,3 @@ int usb_interface_check(u16 vendor, u16 device) return 0; } - diff --git a/payloads/libpayload/drivers/usb/usbhid.c b/payloads/libpayload/drivers/usb/usbhid.c index 51c3d46..110c376 100644 --- a/payloads/libpayload/drivers/usb/usbhid.c +++ b/payloads/libpayload/drivers/usb/usbhid.c @@ -506,4 +506,3 @@ int usbhid_getchar (void) return (int)ret; } - diff --git a/payloads/libpayload/drivers/video/corebootfb.c b/payloads/libpayload/drivers/video/corebootfb.c index d661466..64ea1ab 100644 --- a/payloads/libpayload/drivers/video/corebootfb.c +++ b/payloads/libpayload/drivers/video/corebootfb.c @@ -267,4 +267,3 @@ struct video_console coreboot_video_console = { .columns = 80, .rows = 25 }; - diff --git a/payloads/libpayload/drivers/video/video.c b/payloads/libpayload/drivers/video/video.c index ed47234..bc3f23c 100644 --- a/payloads/libpayload/drivers/video/video.c +++ b/payloads/libpayload/drivers/video/video.c @@ -226,4 +226,3 @@ int video_console_init(void) console_add_output_driver(&cons); return 0; } - diff --git a/payloads/libpayload/include/cbfs.h b/payloads/libpayload/include/cbfs.h index df3bb1c..f1a3a2e 100644 --- a/payloads/libpayload/include/cbfs.h +++ b/payloads/libpayload/include/cbfs.h @@ -89,4 +89,3 @@ int selfboot(struct lb_memory *mem, struct cbfs_payload *payload); int init_default_cbfs_media(struct cbfs_media *media); #endif - diff --git a/payloads/libpayload/include/stddef.h b/payloads/libpayload/include/stddef.h index f9deaeb..4daa62d 100644 --- a/payloads/libpayload/include/stddef.h +++ b/payloads/libpayload/include/stddef.h @@ -14,4 +14,3 @@ typedef __SIZE_TYPE__ ssize_t; #undef unsigned #define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *) 0)->MEMBER) - diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index 92b8dca..cb9835d 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -113,4 +113,3 @@ struct sysinfo_t { extern struct sysinfo_t lib_sysinfo; #endif - diff --git a/payloads/libpayload/libc/ctype.c b/payloads/libpayload/libc/ctype.c index fba9a7c..823f008 100644 --- a/payloads/libpayload/libc/ctype.c +++ b/payloads/libpayload/libc/ctype.c @@ -103,4 +103,3 @@ int toupper(int c) { return (c >= 'a' && c <= 'z') ? (c - 32) : c; } - diff --git a/payloads/libpayload/libc/lib.c b/payloads/libpayload/libc/lib.c index 616a7c6..bead1f8 100644 --- a/payloads/libpayload/libc/lib.c +++ b/payloads/libpayload/libc/lib.c @@ -125,4 +125,3 @@ char *getenv(const char *name) { return NULL; } - diff --git a/payloads/libpayload/libc/memory.c b/payloads/libpayload/libc/memory.c index 12d7e33..f158b08 100644 --- a/payloads/libpayload/libc/memory.c +++ b/payloads/libpayload/libc/memory.c @@ -108,4 +108,3 @@ static int default_memcmp(const void *s1, const void *s2, size_t len) int memcmp(const void *s1, const void *s2, size_t len) __attribute__((weak, alias("default_memcmp"))); - diff --git a/payloads/libpayload/libcbfs/Makefile.inc b/payloads/libpayload/libcbfs/Makefile.inc index 72f6b79..133b215 100644 --- a/payloads/libpayload/libcbfs/Makefile.inc +++ b/payloads/libpayload/libcbfs/Makefile.inc @@ -29,4 +29,3 @@ libcbfs-$(CONFIG_LP_CBFS) += cbfs.c libcbfs-$(CONFIG_LP_CBFS) += ram_media.c - diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c index a3d3e02..c041135 100644 --- a/payloads/libpayload/libcbfs/cbfs_core.c +++ b/payloads/libpayload/libcbfs/cbfs_core.c @@ -215,4 +215,3 @@ int cbfs_decompress(int algo, void *src, void *dst, int len) return 0; } } - diff --git a/payloads/libpayload/liblzma/Makefile.inc b/payloads/libpayload/liblzma/Makefile.inc index 7df45f2..5d4fafa 100644 --- a/payloads/libpayload/liblzma/Makefile.inc +++ b/payloads/libpayload/liblzma/Makefile.inc @@ -28,4 +28,3 @@ ## liblzma-$(CONFIG_LP_LZMA) += lzma.c - diff --git a/payloads/libpayload/libpci/libpci.c b/payloads/libpayload/libpci/libpci.c index e9df10c..7b40e82 100644 --- a/payloads/libpayload/libpci/libpci.c +++ b/payloads/libpayload/libpci/libpci.c @@ -219,4 +219,3 @@ struct pci_dev *pci_get_dev(struct pci_access* pacc, u16 domain, u8 bus, u8 dev, cur->func = func; return cur; } - diff --git a/payloads/libpayload/sample/Makefile b/payloads/libpayload/sample/Makefile index 67697e8..2d15ecf 100644 --- a/payloads/libpayload/sample/Makefile +++ b/payloads/libpayload/sample/Makefile @@ -59,4 +59,3 @@ clean: rm -f $(TARGET).elf *.o distclean: clean - diff --git a/payloads/libpayload/tests/Makefile b/payloads/libpayload/tests/Makefile index 9728722..8c55053 100644 --- a/payloads/libpayload/tests/Makefile +++ b/payloads/libpayload/tests/Makefile @@ -10,4 +10,3 @@ all: $(TARGETS) run: all for i in $(TARGETS); do ./$$i; done - diff --git a/payloads/libpayload/util/kconfig/Makefile b/payloads/libpayload/util/kconfig/Makefile index 624233d..5931e28 100644 --- a/payloads/libpayload/util/kconfig/Makefile +++ b/payloads/libpayload/util/kconfig/Makefile @@ -342,4 +342,3 @@ $(objk)/lxdialog/lxdialog: $(objk)/dochecklxdialog \ $(patsubst %,$(objk)/lxdialog/%,$(lxdialog)) $(HOST_LOADLIBES) -o $@ $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@ - diff --git a/payloads/libpayload/util/kconfig/check.sh b/payloads/libpayload/util/kconfig/check.sh index fa59cbf..15fc294 100755 --- a/payloads/libpayload/util/kconfig/check.sh +++ b/payloads/libpayload/util/kconfig/check.sh @@ -11,4 +11,3 @@ EOF if [ ! "$?" -eq "0" ]; then echo -DKBUILD_NO_NLS; fi - diff --git a/payloads/libpayload/util/kconfig/lex.zconf.c_shipped b/payloads/libpayload/util/kconfig/lex.zconf.c_shipped index 6897092..b01e35a 100644 --- a/payloads/libpayload/util/kconfig/lex.zconf.c_shipped +++ b/payloads/libpayload/util/kconfig/lex.zconf.c_shipped @@ -2371,4 +2371,3 @@ char *zconf_curname(void) { return current_pos.file ? current_pos.file->name : "<none>"; } - diff --git a/payloads/libpayload/util/kconfig/util.c b/payloads/libpayload/util/kconfig/util.c index a47d5e0..24c631f 100644 --- a/payloads/libpayload/util/kconfig/util.c +++ b/payloads/libpayload/util/kconfig/util.c @@ -130,4 +130,3 @@ const char *str_get(struct gstr *gs) { return gs->s; } - diff --git a/payloads/libpayload/util/kconfig/zconf.hash.c_shipped b/payloads/libpayload/util/kconfig/zconf.hash.c_shipped index 5c73d51..3a36ca8 100644 --- a/payloads/libpayload/util/kconfig/zconf.hash.c_shipped +++ b/payloads/libpayload/util/kconfig/zconf.hash.c_shipped @@ -234,4 +234,3 @@ kconf_id_lookup (register const char *str, register unsigned int len) } return 0; } - diff --git a/payloads/libpayload/util/kconfig/zconf.tab.c_shipped b/payloads/libpayload/util/kconfig/zconf.tab.c_shipped index 5868fb8..5ba43dc 100644 --- a/payloads/libpayload/util/kconfig/zconf.tab.c_shipped +++ b/payloads/libpayload/util/kconfig/zconf.tab.c_shipped @@ -2475,4 +2475,3 @@ void zconfdump(FILE *out) #include "expr.c" #include "symbol.c" #include "menu.c" - diff --git a/payloads/nvramcui/nvramcui.c b/payloads/nvramcui/nvramcui.c index daf153b..d7fe133 100644 --- a/payloads/nvramcui/nvramcui.c +++ b/payloads/nvramcui/nvramcui.c @@ -248,4 +248,3 @@ int main() /* TODO: reboot */ halt(); } - diff --git a/payloads/tianocoreboot/Makefile b/payloads/tianocoreboot/Makefile index 3ac541f..97f50af 100644 --- a/payloads/tianocoreboot/Makefile +++ b/payloads/tianocoreboot/Makefile @@ -77,4 +77,3 @@ clean: $(Q)rm -rf $(obj) $(LIBPAYLOAD_DIR) .xcompile .config .config.old .PHONY: $(PHONY) clean - diff --git a/payloads/tianocoreboot/README b/payloads/tianocoreboot/README index 0dce08b..6a8c856 100644 --- a/payloads/tianocoreboot/README +++ b/payloads/tianocoreboot/README @@ -24,4 +24,3 @@ TARGET_ARCH = IA32 X64 build -D DEBUG_ON_SERIAL_PORT --> ./Build/OvmfIa32/DEBUG_GCC46/FV/DXEFV.Fv - diff --git a/payloads/tianocoreboot/include/PiFirmwareFile.h b/payloads/tianocoreboot/include/PiFirmwareFile.h index 750ba70..6723beb 100644 --- a/payloads/tianocoreboot/include/PiFirmwareFile.h +++ b/payloads/tianocoreboot/include/PiFirmwareFile.h @@ -491,4 +491,3 @@ typedef struct { #pragma pack() #endif - diff --git a/payloads/tianocoreboot/include/coff.h b/payloads/tianocoreboot/include/coff.h index b6569a1..9bc0fc9 100644 --- a/payloads/tianocoreboot/include/coff.h +++ b/payloads/tianocoreboot/include/coff.h @@ -103,4 +103,3 @@ typedef struct { uint32_t VirtualAddress; uint32_t SizeOfBlock; } relocation_t; - diff --git a/payloads/tianocoreboot/include/efi.h b/payloads/tianocoreboot/include/efi.h index 8deef53..e582f2b 100644 --- a/payloads/tianocoreboot/include/efi.h +++ b/payloads/tianocoreboot/include/efi.h @@ -33,4 +33,3 @@ typedef unsigned long uintn_t; #define EFI_DXE_FILE_GUID \ { 0xb1644c1a, 0xc16a, 0x4c5b, { 0x88, 0xde, 0xea, 0xfb, 0xa9, 0x7e, 0x74, 0xd8 } } - diff --git a/src/arch/armv7/exception_asm.S b/src/arch/armv7/exception_asm.S index e46f4bc..a735db9 100644 --- a/src/arch/armv7/exception_asm.S +++ b/src/arch/armv7/exception_asm.S @@ -112,4 +112,3 @@ exception_test: add r0, $3 ldr r1, [r1] bx lr - diff --git a/src/arch/x86/boot/wakeup.S b/src/arch/x86/boot/wakeup.S index 8748aa6..9b1b478 100644 --- a/src/arch/x86/boot/wakeup.S +++ b/src/arch/x86/boot/wakeup.S @@ -92,4 +92,3 @@ __wakeup_segment = RELOCATED(.) .globl __wakeup_size __wakeup_size: .long . - __wakeup - diff --git a/src/arch/x86/init/crt0_romcc_epilogue.inc b/src/arch/x86/init/crt0_romcc_epilogue.inc index 419418d..8013d97 100644 --- a/src/arch/x86/init/crt0_romcc_epilogue.inc +++ b/src/arch/x86/init/crt0_romcc_epilogue.inc @@ -19,4 +19,3 @@ __main: post_code(POST_DEAD_CODE) hlt jmp .Lhlt - diff --git a/src/arch/x86/init/prologue.inc b/src/arch/x86/init/prologue.inc index 84e465c..f505b43 100644 --- a/src/arch/x86/init/prologue.inc +++ b/src/arch/x86/init/prologue.inc @@ -22,4 +22,3 @@ .section ".rom.data", "a", @progbits .section ".rom.text", "ax", @progbits - diff --git a/src/cpu/amd/agesa/Kconfig b/src/cpu/amd/agesa/Kconfig index fcba0cf..06b2667 100644 --- a/src/cpu/amd/agesa/Kconfig +++ b/src/cpu/amd/agesa/Kconfig @@ -84,4 +84,3 @@ source src/cpu/amd/agesa/family14/Kconfig source src/cpu/amd/agesa/family15/Kconfig source src/cpu/amd/agesa/family15tn/Kconfig source src/cpu/amd/agesa/family16kb/Kconfig - diff --git a/src/cpu/amd/geode_lx/cache_as_ram.inc b/src/cpu/amd/geode_lx/cache_as_ram.inc index 45fd166..5755a68 100644 --- a/src/cpu/amd/geode_lx/cache_as_ram.inc +++ b/src/cpu/amd/geode_lx/cache_as_ram.inc @@ -227,4 +227,3 @@ __main: post_code(POST_DEAD_CODE) hlt jmp .Lhlt - diff --git a/src/cpu/amd/model_fxx/microcode_rev_c.h b/src/cpu/amd/model_fxx/microcode_rev_c.h index 9805724..5385ea7 100644 --- a/src/cpu/amd/model_fxx/microcode_rev_c.h +++ b/src/cpu/amd/model_fxx/microcode_rev_c.h @@ -145,5 +145,3 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - diff --git a/src/cpu/amd/model_fxx/microcode_rev_d.h b/src/cpu/amd/model_fxx/microcode_rev_d.h index 61a510c..aee12e2 100644 --- a/src/cpu/amd/model_fxx/microcode_rev_d.h +++ b/src/cpu/amd/model_fxx/microcode_rev_d.h @@ -144,5 +144,3 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - diff --git a/src/cpu/amd/model_fxx/microcode_rev_e.h b/src/cpu/amd/model_fxx/microcode_rev_e.h index 7cdeed0..568a936 100644 --- a/src/cpu/amd/model_fxx/microcode_rev_e.h +++ b/src/cpu/amd/model_fxx/microcode_rev_e.h @@ -145,5 +145,3 @@ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - diff --git a/src/cpu/amd/socket_939/Kconfig b/src/cpu/amd/socket_939/Kconfig index 6217072..6a8c1bf 100644 --- a/src/cpu/amd/socket_939/Kconfig +++ b/src/cpu/amd/socket_939/Kconfig @@ -2,4 +2,3 @@ config CPU_AMD_SOCKET_939 bool select CPU_AMD_MODEL_FXX select X86_AMD_FIXED_MTRRS - diff --git a/src/cpu/amd/socket_AM2/Kconfig b/src/cpu/amd/socket_AM2/Kconfig index 7da5a4d..b0ee3ea 100644 --- a/src/cpu/amd/socket_AM2/Kconfig +++ b/src/cpu/amd/socket_AM2/Kconfig @@ -10,4 +10,3 @@ config CPU_SOCKET_TYPE hex default 0x11 depends on CPU_AMD_SOCKET_AM2 - diff --git a/src/cpu/amd/socket_F/Kconfig b/src/cpu/amd/socket_F/Kconfig index 6c2fafa..304aab8 100644 --- a/src/cpu/amd/socket_F/Kconfig +++ b/src/cpu/amd/socket_F/Kconfig @@ -9,4 +9,3 @@ config CPU_SOCKET_TYPE hex default 0x10 depends on CPU_AMD_SOCKET_F - diff --git a/src/cpu/intel/car/cache_as_ram.inc b/src/cpu/intel/car/cache_as_ram.inc index 1ea50b8..cfa57b6 100644 --- a/src/cpu/intel/car/cache_as_ram.inc +++ b/src/cpu/intel/car/cache_as_ram.inc @@ -369,4 +369,3 @@ __main: post_code(POST_DEAD_CODE) hlt jmp .Lhlt - diff --git a/src/cpu/intel/car/cache_as_ram_ht.inc b/src/cpu/intel/car/cache_as_ram_ht.inc index fb65316..522aa59 100644 --- a/src/cpu/intel/car/cache_as_ram_ht.inc +++ b/src/cpu/intel/car/cache_as_ram_ht.inc @@ -451,4 +451,3 @@ mtrr_table: .word 0x208, 0x209, 0x20A, 0x20B .word 0x20C, 0x20D, 0x20E, 0x20F mtrr_table_end: - diff --git a/src/cpu/intel/fit/Kconfig b/src/cpu/intel/fit/Kconfig index 9b57556..e48dca9 100644 --- a/src/cpu/intel/fit/Kconfig +++ b/src/cpu/intel/fit/Kconfig @@ -9,4 +9,3 @@ config CPU_INTEL_NUM_FIT_ENTRIES depends on CPU_INTEL_FIRMWARE_INTERFACE_TABLE help This option selects the number of empty entries in the FIT table. - diff --git a/src/cpu/intel/haswell/cache_as_ram.inc b/src/cpu/intel/haswell/cache_as_ram.inc index 36d5654..07fff76 100644 --- a/src/cpu/intel/haswell/cache_as_ram.inc +++ b/src/cpu/intel/haswell/cache_as_ram.inc @@ -319,4 +319,3 @@ mtrr_table: .word 0x20C, 0x20D, 0x20E, 0x20F .word 0x210, 0x211, 0x212, 0x213 mtrr_table_end: - diff --git a/src/cpu/intel/microcode/update-microcodes.sh b/src/cpu/intel/microcode/update-microcodes.sh index febf6f9..7af446f 100755 --- a/src/cpu/intel/microcode/update-microcodes.sh +++ b/src/cpu/intel/microcode/update-microcodes.sh @@ -104,4 +104,3 @@ move_microcode rm -f $MICROCODE_ARCHIVE rm -f $MICROCODE_FILE - diff --git a/src/cpu/intel/model_106cx/Kconfig b/src/cpu/intel/model_106cx/Kconfig index 456c99d..2c521ee 100644 --- a/src/cpu/intel/model_106cx/Kconfig +++ b/src/cpu/intel/model_106cx/Kconfig @@ -14,4 +14,3 @@ config CPU_INTEL_MODEL_106CX config CPU_ADDR_BITS int default 32 - diff --git a/src/cpu/intel/model_2065x/cache_as_ram.inc b/src/cpu/intel/model_2065x/cache_as_ram.inc index 21f626b..f7b839b 100644 --- a/src/cpu/intel/model_2065x/cache_as_ram.inc +++ b/src/cpu/intel/model_2065x/cache_as_ram.inc @@ -294,4 +294,3 @@ mtrr_table: .word 0x26B, 0x26C, 0x26D .word 0x26E, 0x26F mtrr_table_end: - diff --git a/src/cpu/intel/model_206ax/cache_as_ram.inc b/src/cpu/intel/model_206ax/cache_as_ram.inc index 1a19707..f1d1387 100644 --- a/src/cpu/intel/model_206ax/cache_as_ram.inc +++ b/src/cpu/intel/model_206ax/cache_as_ram.inc @@ -333,4 +333,3 @@ mtrr_table: .word 0x20C, 0x20D, 0x20E, 0x20F .word 0x210, 0x211, 0x212, 0x213 mtrr_table_end: - diff --git a/src/cpu/intel/model_6ex/cache_as_ram.inc b/src/cpu/intel/model_6ex/cache_as_ram.inc index baf4ae8..40cdd9d 100644 --- a/src/cpu/intel/model_6ex/cache_as_ram.inc +++ b/src/cpu/intel/model_6ex/cache_as_ram.inc @@ -245,4 +245,3 @@ mtrr_table: .word 0x208, 0x209, 0x20A, 0x20B .word 0x20C, 0x20D, 0x20E, 0x20F mtrr_table_end: - diff --git a/src/cpu/intel/slot_2/Kconfig b/src/cpu/intel/slot_2/Kconfig index 026099f..1f84d49 100644 --- a/src/cpu/intel/slot_2/Kconfig +++ b/src/cpu/intel/slot_2/Kconfig @@ -24,4 +24,3 @@ config DCACHE_RAM_SIZE hex default 0x01000 depends on CPU_INTEL_SLOT_2 - diff --git a/src/cpu/intel/socket_PGA370/Kconfig b/src/cpu/intel/socket_PGA370/Kconfig index ea2de87..ef0fb21 100644 --- a/src/cpu/intel/socket_PGA370/Kconfig +++ b/src/cpu/intel/socket_PGA370/Kconfig @@ -35,4 +35,3 @@ config DCACHE_RAM_SIZE default 0x01000 endif - diff --git a/src/cpu/intel/socket_mPGA604/Kconfig b/src/cpu/intel/socket_mPGA604/Kconfig index 0d4d45f..d5d668a 100644 --- a/src/cpu/intel/socket_mPGA604/Kconfig +++ b/src/cpu/intel/socket_mPGA604/Kconfig @@ -29,4 +29,3 @@ config DCACHE_RAM_SIZE default 0x4000 endif # CPU_INTEL_SOCKET_MPGA604 - diff --git a/src/cpu/samsung/exynos5420/smp.c b/src/cpu/samsung/exynos5420/smp.c index 2a0656b..22e9f92 100644 --- a/src/cpu/samsung/exynos5420/smp.c +++ b/src/cpu/samsung/exynos5420/smp.c @@ -305,4 +305,3 @@ void exynos5420_config_smp(void) init_exynos_cpu_states(); configure_secondary_cores(); } - diff --git a/src/cpu/via/car/cache_as_ram.inc b/src/cpu/via/car/cache_as_ram.inc index 17b4b83..69e3053 100644 --- a/src/cpu/via/car/cache_as_ram.inc +++ b/src/cpu/via/car/cache_as_ram.inc @@ -276,4 +276,3 @@ __main: post_code(POST_DEAD_CODE) hlt jmp .Lhlt - diff --git a/src/cpu/x86/16bit/entry16.inc b/src/cpu/x86/16bit/entry16.inc index c82edfd..4dad1e5 100644 --- a/src/cpu/x86/16bit/entry16.inc +++ b/src/cpu/x86/16bit/entry16.inc @@ -138,4 +138,3 @@ nullidt: .globl _estart _estart: .code32 - diff --git a/src/cpu/x86/32bit/entry32.inc b/src/cpu/x86/32bit/entry32.inc index f74e1b8..b016f8e 100644 --- a/src/cpu/x86/32bit/entry32.inc +++ b/src/cpu/x86/32bit/entry32.inc @@ -63,4 +63,3 @@ __protected_start: /* Restore the BIST value to %eax */ movl %ebp, %eax - diff --git a/src/cpu/x86/smm/smm_stub.S b/src/cpu/x86/smm/smm_stub.S index 083cb57..b93d204 100644 --- a/src/cpu/x86/smm/smm_stub.S +++ b/src/cpu/x86/smm/smm_stub.S @@ -146,4 +146,3 @@ smm_trampoline32: /* Exit from SM mode. */ rsm - diff --git a/src/cpu/x86/smm/smmhandler.S b/src/cpu/x86/smm/smmhandler.S index 484b643..e02d21b 100644 --- a/src/cpu/x86/smm/smmhandler.S +++ b/src/cpu/x86/smm/smmhandler.S @@ -207,4 +207,3 @@ jumptable: /* core 0 */ ljmp $0xa000, $SMM_HANDLER_OFFSET .align 1024, 0x00 - diff --git a/src/cpu/x86/sse_enable.inc b/src/cpu/x86/sse_enable.inc index 09dea02..a1a7eea 100644 --- a/src/cpu/x86/sse_enable.inc +++ b/src/cpu/x86/sse_enable.inc @@ -27,4 +27,3 @@ /* Restore BIST. */ movl %ebp, %eax - diff --git a/src/device/oprom/x86emu/LICENSE b/src/device/oprom/x86emu/LICENSE index a3ede4a..f13d418 100644 --- a/src/device/oprom/x86emu/LICENSE +++ b/src/device/oprom/x86emu/LICENSE @@ -14,4 +14,3 @@ know. Your code will be removed to comply with your wishes. If you have any questions about this, please send email to x86emu(a)linuxlabs.com or KendallB(a)scitechsoft.com for clarification. - diff --git a/src/drivers/emulation/Kconfig b/src/drivers/emulation/Kconfig index 3da9f38..df8d4ff 100644 --- a/src/drivers/emulation/Kconfig +++ b/src/drivers/emulation/Kconfig @@ -1,2 +1 @@ source src/drivers/emulation/qemu/Kconfig - diff --git a/src/drivers/intel/fsp/cache_as_ram.inc b/src/drivers/intel/fsp/cache_as_ram.inc index 40787b5..a2109d1 100644 --- a/src/drivers/intel/fsp/cache_as_ram.inc +++ b/src/drivers/intel/fsp/cache_as_ram.inc @@ -166,4 +166,3 @@ CAR_init_params: CAR_init_stack: .long CAR_init_done .long CAR_init_params - diff --git a/src/drivers/sil/3114/Kconfig b/src/drivers/sil/3114/Kconfig index a14515c..25bb202 100644 --- a/src/drivers/sil/3114/Kconfig +++ b/src/drivers/sil/3114/Kconfig @@ -4,5 +4,3 @@ config DRIVERS_SIL_3114 help It sets PCI class to IDE compatible native mode, allowing SeaBIOS, FILO etc... to boot from it. - - diff --git a/src/drivers/sil/Kconfig b/src/drivers/sil/Kconfig index a14515c..25bb202 100644 --- a/src/drivers/sil/Kconfig +++ b/src/drivers/sil/Kconfig @@ -4,5 +4,3 @@ config DRIVERS_SIL_3114 help It sets PCI class to IDE compatible native mode, allowing SeaBIOS, FILO etc... to boot from it. - - diff --git a/src/drivers/trident/Kconfig b/src/drivers/trident/Kconfig index 691891d..1dcd5f3 100644 --- a/src/drivers/trident/Kconfig +++ b/src/drivers/trident/Kconfig @@ -1,2 +1 @@ source src/drivers/trident/blade3d/Kconfig - diff --git a/src/include/cbfs.h b/src/include/cbfs.h index ebdbf43..73694c3 100644 --- a/src/include/cbfs.h +++ b/src/include/cbfs.h @@ -118,4 +118,3 @@ load_cached_ramstage(struct romstage_handoff *handoff, #endif /* defined(__PRE_RAM__) */ #endif - diff --git a/src/include/cpu/amd/gx1def.h b/src/include/cpu/amd/gx1def.h index ee36a68..8ac2c52 100644 --- a/src/include/cpu/amd/gx1def.h +++ b/src/include/cpu/amd/gx1def.h @@ -51,4 +51,3 @@ #define MC_SYNC_TIM1 0x840c #define MC_GBASE_ADD 0x8414 - diff --git a/src/include/cpu/amd/microcode.h b/src/include/cpu/amd/microcode.h index e6d686c..578f6c2 100644 --- a/src/include/cpu/amd/microcode.h +++ b/src/include/cpu/amd/microcode.h @@ -10,4 +10,3 @@ void update_microcode(u32 processor_rev_id); #define update_microcode(x) #endif #endif /* CPU_AMD_MICROCODE_H */ - diff --git a/src/include/cpu/amd/model_fxx_rev.h b/src/include/cpu/amd/model_fxx_rev.h index 1e85596..d1ffc0b 100644 --- a/src/include/cpu/amd/model_fxx_rev.h +++ b/src/include/cpu/amd/model_fxx_rev.h @@ -119,4 +119,3 @@ int is_cpu_f0_in_bsp(int nodeid); // defined in model_fxx_init.c #endif #endif - diff --git a/src/include/cpu/x86/name.h b/src/include/cpu/x86/name.h index 2fec878..5a9dd8b 100644 --- a/src/include/cpu/x86/name.h +++ b/src/include/cpu/x86/name.h @@ -23,4 +23,3 @@ void fill_processor_name(char *processor_name); #endif - diff --git a/src/include/device/i915.h b/src/include/device/i915.h index 34f6d0d..1b7a0c9 100644 --- a/src/include/device/i915.h +++ b/src/include/device/i915.h @@ -48,5 +48,3 @@ u32 pack_aux(u32 *src, int src_bytes); void unpack_aux(u32 src, u8 *dst, int dst_bytes); int intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes, u8 *recv, int recv_size); - - diff --git a/src/include/romstage_handoff.h b/src/include/romstage_handoff.h index 307babd..f483779 100644 --- a/src/include/romstage_handoff.h +++ b/src/include/romstage_handoff.h @@ -74,4 +74,3 @@ static inline struct romstage_handoff *romstage_handoff_find_or_add(void) #endif /* defined(__PRE_RAM__) */ #endif /* ROMSTAGE_HANDOFF_H */ - diff --git a/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb b/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb index 221b80c..f1f3693 100644 --- a/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb +++ b/src/mainboard/aaeon/pfm-540i_revb/devicetree.cb @@ -71,4 +71,3 @@ chip northbridge/amd/lx end end end - diff --git a/src/mainboard/amd/db800/devicetree.cb b/src/mainboard/amd/db800/devicetree.cb index 3331a12..781beb5 100644 --- a/src/mainboard/amd/db800/devicetree.cb +++ b/src/mainboard/amd/db800/devicetree.cb @@ -65,4 +65,3 @@ chip northbridge/amd/lx end end end - diff --git a/src/mainboard/amd/dbm690t/devicetree.cb b/src/mainboard/amd/dbm690t/devicetree.cb index 8dd971e..898537b 100644 --- a/src/mainboard/amd/dbm690t/devicetree.cb +++ b/src/mainboard/amd/dbm690t/devicetree.cb @@ -119,4 +119,3 @@ chip northbridge/amd/amdk8/root_complex end #northbridge/amd/amdk8 end #domain end #northbridge/amd/amdk8/root_complex - diff --git a/src/mainboard/amd/dinar/devicetree.cb b/src/mainboard/amd/dinar/devicetree.cb index 09becd4..6e910d3 100644 --- a/src/mainboard/amd/dinar/devicetree.cb +++ b/src/mainboard/amd/dinar/devicetree.cb @@ -106,4 +106,3 @@ chip northbridge/amd/agesa/family15/root_complex end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex end #domain end #northbridge/amd/agesa/family15/root_complex - diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig index 279c7ef..f0f835f 100644 --- a/src/mainboard/amd/inagua/Kconfig +++ b/src/mainboard/amd/inagua/Kconfig @@ -96,4 +96,3 @@ config SB800_AHCI_ROM default n endif # BOARD_AMD_INAGUA - diff --git a/src/mainboard/amd/inagua/devicetree.cb b/src/mainboard/amd/inagua/devicetree.cb index 67c3a1a..95407e5 100644 --- a/src/mainboard/amd/inagua/devicetree.cb +++ b/src/mainboard/amd/inagua/devicetree.cb @@ -94,4 +94,3 @@ chip northbridge/amd/agesa/family14/root_complex end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex end #domain end #northbridge/amd/agesa/family14/root_complex - diff --git a/src/mainboard/amd/norwich/devicetree.cb b/src/mainboard/amd/norwich/devicetree.cb index 93effaa..9a0121d 100644 --- a/src/mainboard/amd/norwich/devicetree.cb +++ b/src/mainboard/amd/norwich/devicetree.cb @@ -38,4 +38,3 @@ chip northbridge/amd/lx end end end - diff --git a/src/mainboard/amd/pistachio/devicetree.cb b/src/mainboard/amd/pistachio/devicetree.cb index 760e5ab..805df7c 100644 --- a/src/mainboard/amd/pistachio/devicetree.cb +++ b/src/mainboard/amd/pistachio/devicetree.cb @@ -78,4 +78,3 @@ chip northbridge/amd/amdk8/root_complex end #northbridge/amd/amdk8 end #domain end #northbridge/amd/amdk8/root_complex - diff --git a/src/mainboard/amd/rumba/devicetree.cb b/src/mainboard/amd/rumba/devicetree.cb index a7a352f..62fb287 100644 --- a/src/mainboard/amd/rumba/devicetree.cb +++ b/src/mainboard/amd/rumba/devicetree.cb @@ -18,4 +18,3 @@ chip northbridge/amd/gx2 end end end - diff --git a/src/mainboard/amd/serengeti_cheetah/devicetree.cb b/src/mainboard/amd/serengeti_cheetah/devicetree.cb index 28b7e01..8ff0e3e 100644 --- a/src/mainboard/amd/serengeti_cheetah/devicetree.cb +++ b/src/mainboard/amd/serengeti_cheetah/devicetree.cb @@ -145,5 +145,3 @@ chip northbridge/amd/amdk8/root_complex end #domain end - - diff --git a/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt b/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt index 685cd7a..ec397ba 100644 --- a/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt +++ b/src/mainboard/amd/serengeti_cheetah/readme_acpi.txt @@ -27,4 +27,3 @@ use c to delele hex file yhlu 09/18/2005 - diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb index 8b5d817..54c34f8 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb +++ b/src/mainboard/amd/serengeti_cheetah_fam10/devicetree.cb @@ -135,5 +135,3 @@ chip northbridge/amd/amdfam10/root_complex # end #domain end - - diff --git a/src/mainboard/amd/south_station/Kconfig b/src/mainboard/amd/south_station/Kconfig index 813dcfc..c058db2 100644 --- a/src/mainboard/amd/south_station/Kconfig +++ b/src/mainboard/amd/south_station/Kconfig @@ -89,4 +89,3 @@ config DRIVERS_PS2_KEYBOARD default n endif # BOARD_AMD_SOUTHSTATION - diff --git a/src/mainboard/amd/south_station/devicetree.cb b/src/mainboard/amd/south_station/devicetree.cb index 60335d7..1e93585 100644 --- a/src/mainboard/amd/south_station/devicetree.cb +++ b/src/mainboard/amd/south_station/devicetree.cb @@ -109,4 +109,3 @@ chip northbridge/amd/agesa/family14/root_complex end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex end #domain end #northbridge/amd/agesa/family14/root_complex - diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig index 6013df7..531abdf 100644 --- a/src/mainboard/amd/torpedo/Kconfig +++ b/src/mainboard/amd/torpedo/Kconfig @@ -167,4 +167,3 @@ config ONBOARD_LIGHTSENSOR default n endif # BOARD_AMD_TORPEDO - diff --git a/src/mainboard/amd/torpedo/devicetree.cb b/src/mainboard/amd/torpedo/devicetree.cb index bc53f13..4b57b3a 100644 --- a/src/mainboard/amd/torpedo/devicetree.cb +++ b/src/mainboard/amd/torpedo/devicetree.cb @@ -87,4 +87,3 @@ chip northbridge/amd/agesa/family12/root_complex end #chip northbridge/amd/agesa/family12 # CPU side of HT root complex end #domain end #northbridge/amd/agesa/family12/root_complex - diff --git a/src/mainboard/amd/union_station/Kconfig b/src/mainboard/amd/union_station/Kconfig index 8955435..eb0d6b2 100644 --- a/src/mainboard/amd/union_station/Kconfig +++ b/src/mainboard/amd/union_station/Kconfig @@ -88,4 +88,3 @@ config DRIVERS_PS2_KEYBOARD default n endif # BOARD_AMD_UNIONSTATION - diff --git a/src/mainboard/amd/union_station/devicetree.cb b/src/mainboard/amd/union_station/devicetree.cb index 2289126..5b4d42b 100644 --- a/src/mainboard/amd/union_station/devicetree.cb +++ b/src/mainboard/amd/union_station/devicetree.cb @@ -85,4 +85,3 @@ chip northbridge/amd/agesa/family14/root_complex end #chip northbridge/amd/agesa/family14 # CPU side of HT root complex end #domain end #northbridge/amd/agesa/family14/root_complex - diff --git a/src/mainboard/arima/hdama/devicetree.cb b/src/mainboard/arima/hdama/devicetree.cb index 2035117..5bb966d 100644 --- a/src/mainboard/arima/hdama/devicetree.cb +++ b/src/mainboard/arima/hdama/devicetree.cb @@ -183,4 +183,3 @@ chip northbridge/amd/amdk8/root_complex end # chip northbridge/amd/amdk8 end end - diff --git a/src/mainboard/artecgroup/dbe61/devicetree.cb b/src/mainboard/artecgroup/dbe61/devicetree.cb index d270f3d..2532885 100644 --- a/src/mainboard/artecgroup/dbe61/devicetree.cb +++ b/src/mainboard/artecgroup/dbe61/devicetree.cb @@ -39,4 +39,3 @@ chip northbridge/amd/lx end end - diff --git a/src/mainboard/asi/mb_5blmp/devicetree.cb b/src/mainboard/asi/mb_5blmp/devicetree.cb index e8e6ac3..4a94a58 100644 --- a/src/mainboard/asi/mb_5blmp/devicetree.cb +++ b/src/mainboard/asi/mb_5blmp/devicetree.cb @@ -45,4 +45,3 @@ chip northbridge/amd/gx1 # Northbridge chip cpu/amd/geode_gx1 # CPU end end - diff --git a/src/mainboard/asrock/939a785gmh/devicetree.cb b/src/mainboard/asrock/939a785gmh/devicetree.cb index f246dcf..8b40b9f 100644 --- a/src/mainboard/asrock/939a785gmh/devicetree.cb +++ b/src/mainboard/asrock/939a785gmh/devicetree.cb @@ -129,4 +129,3 @@ chip northbridge/amd/amdk8/root_complex end #northbridge/amd/amdk8 end #domain end #northbridge/amd/amdk8/root_complex - diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig index 00cdaa7..876474d 100644 --- a/src/mainboard/asrock/e350m1/Kconfig +++ b/src/mainboard/asrock/e350m1/Kconfig @@ -82,4 +82,3 @@ config DRIVERS_PS2_KEYBOARD default n endif # BOARD_ASROCK_E350M1 - diff --git a/src/mainboard/asus/mew-vm/devicetree.cb b/src/mainboard/asus/mew-vm/devicetree.cb index e0cc9e3..397b999 100644 --- a/src/mainboard/asus/mew-vm/devicetree.cb +++ b/src/mainboard/asus/mew-vm/devicetree.cb @@ -49,4 +49,3 @@ chip northbridge/intel/i82810 chip cpu/intel/socket_PGA370 end end - diff --git a/src/mainboard/broadcom/blast/devicetree.cb b/src/mainboard/broadcom/blast/devicetree.cb index 9de4331..3e02a19 100644 --- a/src/mainboard/broadcom/blast/devicetree.cb +++ b/src/mainboard/broadcom/blast/devicetree.cb @@ -120,4 +120,3 @@ chip northbridge/amd/amdk8/root_complex end #domain end - diff --git a/src/mainboard/cubietech/cubieboard/board_info.txt b/src/mainboard/cubietech/cubieboard/board_info.txt index 14a3755..c67b641 100644 --- a/src/mainboard/cubietech/cubieboard/board_info.txt +++ b/src/mainboard/cubietech/cubieboard/board_info.txt @@ -1,2 +1 @@ Category: sbc - diff --git a/src/mainboard/digitallogic/msm800sev/devicetree.cb b/src/mainboard/digitallogic/msm800sev/devicetree.cb index 839b767..db511e5 100644 --- a/src/mainboard/digitallogic/msm800sev/devicetree.cb +++ b/src/mainboard/digitallogic/msm800sev/devicetree.cb @@ -83,4 +83,3 @@ chip northbridge/amd/lx end end - diff --git a/src/mainboard/eaglelion/5bcm/devicetree.cb b/src/mainboard/eaglelion/5bcm/devicetree.cb index 33f1f90..1ea541a 100644 --- a/src/mainboard/eaglelion/5bcm/devicetree.cb +++ b/src/mainboard/eaglelion/5bcm/devicetree.cb @@ -49,4 +49,3 @@ chip northbridge/amd/gx1 end end - diff --git a/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc b/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc index 9e47473..15b86a2 100644 --- a/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc +++ b/src/mainboard/emulation/qemu-i440fx/cache_as_ram.inc @@ -71,4 +71,3 @@ __main: post_code(POST_DEAD_CODE) hlt jmp .Lhlt - diff --git a/src/mainboard/hp/dl145_g1/devicetree.cb b/src/mainboard/hp/dl145_g1/devicetree.cb index c955ac3..2d4adee 100644 --- a/src/mainboard/hp/dl145_g1/devicetree.cb +++ b/src/mainboard/hp/dl145_g1/devicetree.cb @@ -139,4 +139,3 @@ chip northbridge/amd/amdk8/root_complex end end end - diff --git a/src/mainboard/hp/dl145_g3/devicetree.cb b/src/mainboard/hp/dl145_g3/devicetree.cb index 7012cf9..b7f450e 100644 --- a/src/mainboard/hp/dl145_g3/devicetree.cb +++ b/src/mainboard/hp/dl145_g3/devicetree.cb @@ -83,5 +83,3 @@ chip northbridge/amd/amdk8/root_complex end #domain end - - diff --git a/src/mainboard/hp/dl165_g6_fam10/devicetree.cb b/src/mainboard/hp/dl165_g6_fam10/devicetree.cb index 2dbcb9b..e321393 100644 --- a/src/mainboard/hp/dl165_g6_fam10/devicetree.cb +++ b/src/mainboard/hp/dl165_g6_fam10/devicetree.cb @@ -86,5 +86,3 @@ chip northbridge/amd/amdfam10/root_complex end #domain end - - diff --git a/src/mainboard/hp/e_vectra_p2706t/devicetree.cb b/src/mainboard/hp/e_vectra_p2706t/devicetree.cb index 7de0c83..04d6d8d 100644 --- a/src/mainboard/hp/e_vectra_p2706t/devicetree.cb +++ b/src/mainboard/hp/e_vectra_p2706t/devicetree.cb @@ -56,4 +56,3 @@ chip northbridge/intel/i82810 # Northbridge end end end - diff --git a/src/mainboard/ibm/e325/devicetree.cb b/src/mainboard/ibm/e325/devicetree.cb index bdaee50..f63249d 100644 --- a/src/mainboard/ibm/e325/devicetree.cb +++ b/src/mainboard/ibm/e325/devicetree.cb @@ -67,4 +67,3 @@ chip northbridge/amd/amdk8/root_complex end end end - diff --git a/src/mainboard/ibm/e326/devicetree.cb b/src/mainboard/ibm/e326/devicetree.cb index 1888987..32d04a7 100644 --- a/src/mainboard/ibm/e326/devicetree.cb +++ b/src/mainboard/ibm/e326/devicetree.cb @@ -71,4 +71,3 @@ chip northbridge/amd/amdk8/root_complex end end end - diff --git a/src/mainboard/iei/juki-511p/devicetree.cb b/src/mainboard/iei/juki-511p/devicetree.cb index 4706ff5..4e2b1d9 100644 --- a/src/mainboard/iei/juki-511p/devicetree.cb +++ b/src/mainboard/iei/juki-511p/devicetree.cb @@ -54,4 +54,3 @@ chip northbridge/amd/gx1 end end - diff --git a/src/mainboard/iei/kino-780am2-fam10/devicetree.cb b/src/mainboard/iei/kino-780am2-fam10/devicetree.cb index d5c7033..1dffb4b 100644 --- a/src/mainboard/iei/kino-780am2-fam10/devicetree.cb +++ b/src/mainboard/iei/kino-780am2-fam10/devicetree.cb @@ -68,4 +68,3 @@ chip northbridge/amd/amdfam10/root_complex end end #domain end #root_complex - diff --git a/src/mainboard/iei/nova4899r/devicetree.cb b/src/mainboard/iei/nova4899r/devicetree.cb index f27662e..2650f75 100644 --- a/src/mainboard/iei/nova4899r/devicetree.cb +++ b/src/mainboard/iei/nova4899r/devicetree.cb @@ -61,4 +61,3 @@ chip northbridge/amd/gx1 end end - diff --git a/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb b/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb index a6dba30..99851b8 100644 --- a/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb +++ b/src/mainboard/iei/pcisa-lx-800-r10/devicetree.cb @@ -73,4 +73,3 @@ chip northbridge/amd/lx end end end - diff --git a/src/mainboard/intel/eagleheights/devicetree.cb b/src/mainboard/intel/eagleheights/devicetree.cb index b37750c..8d1549a 100644 --- a/src/mainboard/intel/eagleheights/devicetree.cb +++ b/src/mainboard/intel/eagleheights/devicetree.cb @@ -70,4 +70,3 @@ chip northbridge/intel/i3100 end end end - diff --git a/src/mainboard/intel/mohonpeak/acpi/platform.asl b/src/mainboard/intel/mohonpeak/acpi/platform.asl index aab7603..9b79e3b 100644 --- a/src/mainboard/intel/mohonpeak/acpi/platform.asl +++ b/src/mainboard/intel/mohonpeak/acpi/platform.asl @@ -62,4 +62,3 @@ Method(_WAK,1) { Return(Package(){0,0}) } - diff --git a/src/mainboard/intel/mohonpeak/cmos.layout b/src/mainboard/intel/mohonpeak/cmos.layout index 16ae12f..a668188 100644 --- a/src/mainboard/intel/mohonpeak/cmos.layout +++ b/src/mainboard/intel/mohonpeak/cmos.layout @@ -137,5 +137,3 @@ enumerations checksums checksum 392 415 984 - - diff --git a/src/mainboard/intel/mohonpeak/irq_tables.c b/src/mainboard/intel/mohonpeak/irq_tables.c index eeb0dc6..27b7726 100755 --- a/src/mainboard/intel/mohonpeak/irq_tables.c +++ b/src/mainboard/intel/mohonpeak/irq_tables.c @@ -65,4 +65,3 @@ unsigned long write_pirq_routing_table(unsigned long addr) { return copy_pirq_routing_table(addr, &intel_irq_routing_table); } - diff --git a/src/mainboard/intel/mohonpeak/mainboard.c b/src/mainboard/intel/mohonpeak/mainboard.c index 0274e16..9e4a848 100644 --- a/src/mainboard/intel/mohonpeak/mainboard.c +++ b/src/mainboard/intel/mohonpeak/mainboard.c @@ -47,4 +47,3 @@ static void mainboard_enable(device_t dev) struct chip_operations mainboard_ops = { .enable_dev = mainboard_enable, }; - diff --git a/src/mainboard/iwave/iWRainbowG6/devicetree.cb b/src/mainboard/iwave/iWRainbowG6/devicetree.cb index 84cfc4b..16709db 100644 --- a/src/mainboard/iwave/iWRainbowG6/devicetree.cb +++ b/src/mainboard/iwave/iWRainbowG6/devicetree.cb @@ -36,4 +36,3 @@ chip northbridge/intel/sch end end end - diff --git a/src/mainboard/iwill/dk8_htx/devicetree.cb b/src/mainboard/iwill/dk8_htx/devicetree.cb index 50d214b..c49c97a 100644 --- a/src/mainboard/iwill/dk8_htx/devicetree.cb +++ b/src/mainboard/iwill/dk8_htx/devicetree.cb @@ -115,5 +115,3 @@ chip northbridge/amd/amdk8/root_complex end #domain end - - diff --git a/src/mainboard/iwill/dk8s2/devicetree.cb b/src/mainboard/iwill/dk8s2/devicetree.cb index fda8ca2..21eadb3 100644 --- a/src/mainboard/iwill/dk8s2/devicetree.cb +++ b/src/mainboard/iwill/dk8s2/devicetree.cb @@ -73,4 +73,3 @@ chip northbridge/amd/amdk8/root_complex end end end - diff --git a/src/mainboard/iwill/dk8x/devicetree.cb b/src/mainboard/iwill/dk8x/devicetree.cb index ea7430b..d92cd6d 100644 --- a/src/mainboard/iwill/dk8x/devicetree.cb +++ b/src/mainboard/iwill/dk8x/devicetree.cb @@ -54,4 +54,3 @@ chip northbridge/amd/amdk8/root_complex end end end - diff --git a/src/mainboard/kontron/kt690/devicetree.cb b/src/mainboard/kontron/kt690/devicetree.cb index 22bdae9..3ab3337 100644 --- a/src/mainboard/kontron/kt690/devicetree.cb +++ b/src/mainboard/kontron/kt690/devicetree.cb @@ -123,4 +123,3 @@ chip northbridge/amd/amdk8/root_complex end #northbridge/amd/amdk8 end #domain end #northbridge/amd/amdk8/root_complex - diff --git a/src/mainboard/lippert/frontrunner/devicetree.cb b/src/mainboard/lippert/frontrunner/devicetree.cb index 78d099a..eb518ea 100644 --- a/src/mainboard/lippert/frontrunner/devicetree.cb +++ b/src/mainboard/lippert/frontrunner/devicetree.cb @@ -18,4 +18,3 @@ chip northbridge/amd/gx2 end end end - diff --git a/src/mainboard/msi/ms6178/devicetree.cb b/src/mainboard/msi/ms6178/devicetree.cb index 26e0e0a..48870e8 100644 --- a/src/mainboard/msi/ms6178/devicetree.cb +++ b/src/mainboard/msi/ms6178/devicetree.cb @@ -81,4 +81,3 @@ chip northbridge/intel/i82810 # Northbridge end end end - diff --git a/src/mainboard/msi/ms9185/devicetree.cb b/src/mainboard/msi/ms9185/devicetree.cb index 013bba3..3c9168d 100644 --- a/src/mainboard/msi/ms9185/devicetree.cb +++ b/src/mainboard/msi/ms9185/devicetree.cb @@ -83,5 +83,3 @@ chip northbridge/amd/amdk8/root_complex end # amdk8 end #domain end - - diff --git a/src/mainboard/nec/powermate2000/devicetree.cb b/src/mainboard/nec/powermate2000/devicetree.cb index cd4aefe..a3f164e 100644 --- a/src/mainboard/nec/powermate2000/devicetree.cb +++ b/src/mainboard/nec/powermate2000/devicetree.cb @@ -51,4 +51,3 @@ chip northbridge/intel/i82810 # Northbridge end end end - diff --git a/src/mainboard/newisys/khepri/devicetree.cb b/src/mainboard/newisys/khepri/devicetree.cb index bd00d28..8f7455c 100644 --- a/src/mainboard/newisys/khepri/devicetree.cb +++ b/src/mainboard/newisys/khepri/devicetree.cb @@ -79,4 +79,3 @@ chip northbridge/amd/amdk8/root_complex end end end - diff --git a/src/mainboard/pcengines/alix1c/devicetree.cb b/src/mainboard/pcengines/alix1c/devicetree.cb index 85e967a..20e865a 100644 --- a/src/mainboard/pcengines/alix1c/devicetree.cb +++ b/src/mainboard/pcengines/alix1c/devicetree.cb @@ -83,4 +83,3 @@ chip northbridge/amd/lx end end - diff --git a/src/mainboard/pcengines/alix2d/devicetree.cb b/src/mainboard/pcengines/alix2d/devicetree.cb index d8aa3bc..f8368ed 100644 --- a/src/mainboard/pcengines/alix2d/devicetree.cb +++ b/src/mainboard/pcengines/alix2d/devicetree.cb @@ -43,4 +43,3 @@ chip northbridge/amd/lx end end - diff --git a/src/mainboard/pcengines/alix6/board_info.txt b/src/mainboard/pcengines/alix6/board_info.txt index db8bbb2..6af0ddf 100644 --- a/src/mainboard/pcengines/alix6/board_info.txt +++ b/src/mainboard/pcengines/alix6/board_info.txt @@ -2,4 +2,3 @@ Category: half Board URL: http://pcengines.ch/alix6f2.htm Flashrom support: y Clone of: pcengines/alix2d - diff --git a/src/mainboard/rca/rm4100/devicetree.cb b/src/mainboard/rca/rm4100/devicetree.cb index d39126c..7c31423 100644 --- a/src/mainboard/rca/rm4100/devicetree.cb +++ b/src/mainboard/rca/rm4100/devicetree.cb @@ -65,4 +65,3 @@ chip northbridge/intel/i82830 # Northbridge end end end - diff --git a/src/mainboard/siemens/sitemp_g1p1/devicetree.cb b/src/mainboard/siemens/sitemp_g1p1/devicetree.cb index 1d83f10..e47703f 100644 --- a/src/mainboard/siemens/sitemp_g1p1/devicetree.cb +++ b/src/mainboard/siemens/sitemp_g1p1/devicetree.cb @@ -132,4 +132,3 @@ chip northbridge/amd/amdk8/root_complex end #northbridge/amd/amdk8 end #domain end #northbridge/amd/amdk8/root_complex - diff --git a/src/mainboard/supermicro/h8dmr_fam10/README b/src/mainboard/supermicro/h8dmr_fam10/README index 485e7c8..1d7bbdc 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/README +++ b/src/mainboard/supermicro/h8dmr_fam10/README @@ -20,4 +20,3 @@ disabled in CBFS. I'm not sure what's causing this particular slowness. See also this thread: http://www.coreboot.org/pipermail/coreboot/2009-September/052107.html Ward, 2009-09-22 - diff --git a/src/mainboard/supermicro/h8qgi/Kconfig b/src/mainboard/supermicro/h8qgi/Kconfig index ee78a2f..c333fba 100644 --- a/src/mainboard/supermicro/h8qgi/Kconfig +++ b/src/mainboard/supermicro/h8qgi/Kconfig @@ -90,4 +90,3 @@ config VGA_BIOS_ID default "102b,0532" endif # BOARD_SUPERMICRO_H8QGI - diff --git a/src/mainboard/supermicro/h8qgi/devicetree.cb b/src/mainboard/supermicro/h8qgi/devicetree.cb index d99a6ba..6d60820 100644 --- a/src/mainboard/supermicro/h8qgi/devicetree.cb +++ b/src/mainboard/supermicro/h8qgi/devicetree.cb @@ -135,4 +135,3 @@ chip northbridge/amd/agesa/family15/root_complex end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex end #domain end #northbridge/amd/agesa/family15/root_complex - diff --git a/src/mainboard/supermicro/h8scm/devicetree.cb b/src/mainboard/supermicro/h8scm/devicetree.cb index a4e6c97..f4e4639 100644 --- a/src/mainboard/supermicro/h8scm/devicetree.cb +++ b/src/mainboard/supermicro/h8scm/devicetree.cb @@ -130,4 +130,3 @@ chip northbridge/amd/agesa/family15/root_complex end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex end #domain end #northbridge/amd/agesa/family15/root_complex - diff --git a/src/mainboard/supermicro/h8scm_fam10/devicetree.cb b/src/mainboard/supermicro/h8scm_fam10/devicetree.cb index 9dda5d8..82229da 100644 --- a/src/mainboard/supermicro/h8scm_fam10/devicetree.cb +++ b/src/mainboard/supermicro/h8scm_fam10/devicetree.cb @@ -121,5 +121,3 @@ chip northbridge/amd/amdfam10/root_complex # end #domain end - - diff --git a/src/mainboard/supermicro/x6dai_g/devicetree.cb b/src/mainboard/supermicro/x6dai_g/devicetree.cb index 60508a3..7d6a3c6 100644 --- a/src/mainboard/supermicro/x6dai_g/devicetree.cb +++ b/src/mainboard/supermicro/x6dai_g/devicetree.cb @@ -62,4 +62,3 @@ chip northbridge/intel/e7525 # mch end end end - diff --git a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb index 3a037fb..ae38250 100644 --- a/src/mainboard/supermicro/x6dhr_ig/devicetree.cb +++ b/src/mainboard/supermicro/x6dhr_ig/devicetree.cb @@ -82,4 +82,3 @@ chip northbridge/intel/e7520 # mch end register "intrline" = "0x00070105" end - diff --git a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb index ca8650b..1d5dd8f 100644 --- a/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb +++ b/src/mainboard/supermicro/x6dhr_ig2/devicetree.cb @@ -73,4 +73,3 @@ chip northbridge/intel/e7520 # mch end register "intrline" = "0x00070105" end - diff --git a/src/mainboard/technexion/tim5690/devicetree.cb b/src/mainboard/technexion/tim5690/devicetree.cb index 23b9741..bf462e2 100644 --- a/src/mainboard/technexion/tim5690/devicetree.cb +++ b/src/mainboard/technexion/tim5690/devicetree.cb @@ -110,4 +110,3 @@ chip northbridge/amd/amdk8/root_complex end #northbridge/amd/amdk8 end #domain end #northbridge/amd/amdk8/root_complex - diff --git a/src/mainboard/technexion/tim8690/devicetree.cb b/src/mainboard/technexion/tim8690/devicetree.cb index ff14075..8d1df8b 100644 --- a/src/mainboard/technexion/tim8690/devicetree.cb +++ b/src/mainboard/technexion/tim8690/devicetree.cb @@ -113,4 +113,3 @@ chip northbridge/amd/amdk8/root_complex end #northbridge/amd/amdk8 end #domain end #northbridge/amd/amdk8/root_complex - diff --git a/src/mainboard/tyan/s2735/devicetree.cb b/src/mainboard/tyan/s2735/devicetree.cb index d3b6b1e..866bdc5 100644 --- a/src/mainboard/tyan/s2735/devicetree.cb +++ b/src/mainboard/tyan/s2735/devicetree.cb @@ -83,4 +83,3 @@ chip northbridge/intel/e7501 end end end - diff --git a/src/mainboard/tyan/s2850/devicetree.cb b/src/mainboard/tyan/s2850/devicetree.cb index 85c6384..2698542 100644 --- a/src/mainboard/tyan/s2850/devicetree.cb +++ b/src/mainboard/tyan/s2850/devicetree.cb @@ -93,4 +93,3 @@ chip northbridge/amd/amdk8/root_complex end end end - diff --git a/src/mainboard/tyan/s2875/devicetree.cb b/src/mainboard/tyan/s2875/devicetree.cb index 39eb8b2..bdb4705 100644 --- a/src/mainboard/tyan/s2875/devicetree.cb +++ b/src/mainboard/tyan/s2875/devicetree.cb @@ -85,4 +85,3 @@ chip northbridge/amd/amdk8/root_complex end end end - diff --git a/src/mainboard/tyan/s2880/devicetree.cb b/src/mainboard/tyan/s2880/devicetree.cb index f9f4856..3e18f55 100644 --- a/src/mainboard/tyan/s2880/devicetree.cb +++ b/src/mainboard/tyan/s2880/devicetree.cb @@ -96,4 +96,3 @@ chip northbridge/amd/amdk8/root_complex end end end - diff --git a/src/mainboard/tyan/s2881/devicetree.cb b/src/mainboard/tyan/s2881/devicetree.cb index aab75a3..7d0ed5e 100644 --- a/src/mainboard/tyan/s2881/devicetree.cb +++ b/src/mainboard/tyan/s2881/devicetree.cb @@ -127,4 +127,3 @@ chip northbridge/amd/amdk8/root_complex end end end - diff --git a/src/mainboard/tyan/s2882/devicetree.cb b/src/mainboard/tyan/s2882/devicetree.cb index 4074695..74a26d0 100644 --- a/src/mainboard/tyan/s2882/devicetree.cb +++ b/src/mainboard/tyan/s2882/devicetree.cb @@ -123,4 +123,3 @@ chip northbridge/amd/amdk8/root_complex end # NB end #domain end - diff --git a/src/mainboard/tyan/s2885/devicetree.cb b/src/mainboard/tyan/s2885/devicetree.cb index 7191e52..97a18e5 100644 --- a/src/mainboard/tyan/s2885/devicetree.cb +++ b/src/mainboard/tyan/s2885/devicetree.cb @@ -120,4 +120,3 @@ chip northbridge/amd/amdk8/root_complex end #domain end - diff --git a/src/mainboard/tyan/s4880/devicetree.cb b/src/mainboard/tyan/s4880/devicetree.cb index da59eb5..d64d054 100644 --- a/src/mainboard/tyan/s4880/devicetree.cb +++ b/src/mainboard/tyan/s4880/devicetree.cb @@ -96,4 +96,3 @@ chip northbridge/amd/amdk8/root_complex end #domain end - diff --git a/src/mainboard/tyan/s4882/devicetree.cb b/src/mainboard/tyan/s4882/devicetree.cb index 44da2c2..0eb59af 100644 --- a/src/mainboard/tyan/s4882/devicetree.cb +++ b/src/mainboard/tyan/s4882/devicetree.cb @@ -193,4 +193,3 @@ chip northbridge/amd/amdk8/root_complex end end - diff --git a/src/mainboard/tyan/s8226/devicetree.cb b/src/mainboard/tyan/s8226/devicetree.cb index f879ec5..ffe47b0 100644 --- a/src/mainboard/tyan/s8226/devicetree.cb +++ b/src/mainboard/tyan/s8226/devicetree.cb @@ -130,4 +130,3 @@ chip northbridge/amd/agesa/family15/root_complex end #chip northbridge/amd/agesa/family15 # CPU side of HT root complex end #domain end #northbridge/amd/agesa/family15/root_complex - diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig index da71c87..408206c 100644 --- a/src/mainboard/via/vt8454c/Kconfig +++ b/src/mainboard/via/vt8454c/Kconfig @@ -24,4 +24,3 @@ config IRQ_SLOT_COUNT default 15 endif # BOARD_VIA_VT8454C - diff --git a/src/mainboard/via/vt8454c/devicetree.cb b/src/mainboard/via/vt8454c/devicetree.cb index 87d2ed1..efb5b6c 100644 --- a/src/mainboard/via/vt8454c/devicetree.cb +++ b/src/mainboard/via/vt8454c/devicetree.cb @@ -51,4 +51,3 @@ chip northbridge/via/cx700 #device pci 12.0 on end # Ethernet end # pci domain 0 end # cx700 - diff --git a/src/mainboard/winent/pl6064/devicetree.cb b/src/mainboard/winent/pl6064/devicetree.cb index f900f78..20d7561 100644 --- a/src/mainboard/winent/pl6064/devicetree.cb +++ b/src/mainboard/winent/pl6064/devicetree.cb @@ -78,4 +78,3 @@ chip northbridge/amd/lx end end end - diff --git a/src/mainboard/wyse/s50/devicetree.cb b/src/mainboard/wyse/s50/devicetree.cb index 9008fe6..0288144 100644 --- a/src/mainboard/wyse/s50/devicetree.cb +++ b/src/mainboard/wyse/s50/devicetree.cb @@ -49,4 +49,3 @@ chip northbridge/amd/gx2 end end end - diff --git a/src/northbridge/amd/gx1/Kconfig b/src/northbridge/amd/gx1/Kconfig index 4d57613..86de9d7 100644 --- a/src/northbridge/amd/gx1/Kconfig +++ b/src/northbridge/amd/gx1/Kconfig @@ -19,4 +19,3 @@ config NORTHBRIDGE_AMD_GX1 bool - diff --git a/src/northbridge/intel/e7501/Kconfig b/src/northbridge/intel/e7501/Kconfig index c8219e8..f8a35a8 100644 --- a/src/northbridge/intel/e7501/Kconfig +++ b/src/northbridge/intel/e7501/Kconfig @@ -1,4 +1,3 @@ config NORTHBRIDGE_INTEL_E7501 bool select HAVE_DEBUG_RAM_SETUP - diff --git a/src/northbridge/intel/i440bx/Kconfig b/src/northbridge/intel/i440bx/Kconfig index 902eb73..7544fb5 100644 --- a/src/northbridge/intel/i440bx/Kconfig +++ b/src/northbridge/intel/i440bx/Kconfig @@ -33,4 +33,3 @@ config SDRAMPWR_4DIMM If your board has 4 DIMM slots, you must use select this option, in your Kconfig file of the board. On boards with 3 DIMM slots, do _not_ select this option. - diff --git a/src/northbridge/intel/i440lx/Kconfig b/src/northbridge/intel/i440lx/Kconfig index a88a7a1..80548db 100644 --- a/src/northbridge/intel/i440lx/Kconfig +++ b/src/northbridge/intel/i440lx/Kconfig @@ -20,4 +20,3 @@ config NORTHBRIDGE_INTEL_I440LX bool select HAVE_DEBUG_RAM_SETUP - diff --git a/src/northbridge/intel/i82810/Kconfig b/src/northbridge/intel/i82810/Kconfig index 79fe36a..a0d9872 100644 --- a/src/northbridge/intel/i82810/Kconfig +++ b/src/northbridge/intel/i82810/Kconfig @@ -46,4 +46,3 @@ config VGA_BIOS_ID string default "8086,7121" depends on NORTHBRIDGE_INTEL_I82810 - diff --git a/src/northbridge/intel/i82830/Kconfig b/src/northbridge/intel/i82830/Kconfig index 20b31a2..f7fff2d 100644 --- a/src/northbridge/intel/i82830/Kconfig +++ b/src/northbridge/intel/i82830/Kconfig @@ -25,4 +25,3 @@ config VIDEO_MB default 1 if I830_VIDEO_MB_1MB default 8 if I830_VIDEO_MB_8MB depends on NORTHBRIDGE_INTEL_I82830 - diff --git a/src/northbridge/via/cn400/Kconfig b/src/northbridge/via/cn400/Kconfig index 42fa096..58b9afc 100644 --- a/src/northbridge/via/cn400/Kconfig +++ b/src/northbridge/via/cn400/Kconfig @@ -33,4 +33,3 @@ config VIDEO_MB default 64 if CN400_VIDEO_MB_64MB default 128 if CN400_VIDEO_MB_128MB depends on NORTHBRIDGE_VIA_CN400 - diff --git a/src/northbridge/via/cn700/Kconfig b/src/northbridge/via/cn700/Kconfig index 34c330e..c6f73d8 100644 --- a/src/northbridge/via/cn700/Kconfig +++ b/src/northbridge/via/cn700/Kconfig @@ -34,4 +34,3 @@ config VIDEO_MB default 64 if CN700_VIDEO_MB_64MB default 128 if CN700_VIDEO_MB_128MB depends on NORTHBRIDGE_VIA_CN700 - diff --git a/src/northbridge/via/vt8601/Kconfig b/src/northbridge/via/vt8601/Kconfig index 1b20267..bed2b73 100644 --- a/src/northbridge/via/vt8601/Kconfig +++ b/src/northbridge/via/vt8601/Kconfig @@ -1,4 +1,3 @@ config NORTHBRIDGE_VIA_VT8601 bool select HAVE_DEBUG_RAM_SETUP - diff --git a/src/northbridge/via/vt8623/Kconfig b/src/northbridge/via/vt8623/Kconfig index c2aa82b..353b825 100644 --- a/src/northbridge/via/vt8623/Kconfig +++ b/src/northbridge/via/vt8623/Kconfig @@ -1,3 +1,2 @@ config NORTHBRIDGE_VIA_VT8623 bool - diff --git a/src/northbridge/via/vx800/Kconfig b/src/northbridge/via/vx800/Kconfig index 48ea456..6264d52 100644 --- a/src/northbridge/via/vx800/Kconfig +++ b/src/northbridge/via/vx800/Kconfig @@ -2,4 +2,3 @@ config NORTHBRIDGE_VIA_VX800 bool select HAVE_DEBUG_RAM_SETUP select HAVE_DEBUG_SMBUS - diff --git a/src/soc/intel/baytrail/romstage/cache_as_ram.inc b/src/soc/intel/baytrail/romstage/cache_as_ram.inc index f6e029d..266e207 100644 --- a/src/soc/intel/baytrail/romstage/cache_as_ram.inc +++ b/src/soc/intel/baytrail/romstage/cache_as_ram.inc @@ -283,4 +283,3 @@ fixed_mtrr_table: .word 0x26B, 0x26C, 0x26D .word 0x26E, 0x26F fixed_mtrr_table_end: - diff --git a/src/soc/nvidia/tegra124/timer.c b/src/soc/nvidia/tegra124/timer.c index 83f499c..747f8fb 100644 --- a/src/soc/nvidia/tegra124/timer.c +++ b/src/soc/nvidia/tegra124/timer.c @@ -50,4 +50,3 @@ void udelay(unsigned usec) while (mono_time_before(&current, &end)) timer_monotonic_get(&current); } - diff --git a/src/southbridge/amd/amd8131/Kconfig b/src/southbridge/amd/amd8131/Kconfig index 6093a56..a32e262 100644 --- a/src/southbridge/amd/amd8131/Kconfig +++ b/src/southbridge/amd/amd8131/Kconfig @@ -19,4 +19,3 @@ config SOUTHBRIDGE_AMD_AMD8131 bool - diff --git a/src/southbridge/amd/cimx/sb700/Kconfig b/src/southbridge/amd/cimx/sb700/Kconfig index a4f9aa0..2be21b5 100644 --- a/src/southbridge/amd/cimx/sb700/Kconfig +++ b/src/southbridge/amd/cimx/sb700/Kconfig @@ -68,4 +68,3 @@ config REDIRECT_SBCIMX_TRACE_TO_SERIAL Warning: Only enable this option when debuging or tracing AMD CIMX code. endif #SOUTHBRIDGE_AMD_CIMX_SB700 - diff --git a/src/southbridge/amd/cimx/sb800/Kconfig b/src/southbridge/amd/cimx/sb800/Kconfig index ac25e89..564013b 100644 --- a/src/southbridge/amd/cimx/sb800/Kconfig +++ b/src/southbridge/amd/cimx/sb800/Kconfig @@ -223,4 +223,3 @@ config SB800_IMC_FAN_CONTROL endchoice endif #SOUTHBRIDGE_AMD_CIMX_SB800 - diff --git a/src/southbridge/amd/cimx/sb900/Kconfig b/src/southbridge/amd/cimx/sb900/Kconfig index 3bef95a..39c55e1 100644 --- a/src/southbridge/amd/cimx/sb900/Kconfig +++ b/src/southbridge/amd/cimx/sb900/Kconfig @@ -55,4 +55,3 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT default "southbridge/amd/cimx/sb900/bootblock.c" endif #SOUTHBRIDGE_AMD_CIMX_SB900 - diff --git a/src/southbridge/amd/cs5530/Kconfig b/src/southbridge/amd/cs5530/Kconfig index 3e04276..76f1252 100644 --- a/src/southbridge/amd/cs5530/Kconfig +++ b/src/southbridge/amd/cs5530/Kconfig @@ -71,4 +71,3 @@ config SPLASH_GRAPHIC depends on GX1_VIDEO endmenu - diff --git a/src/southbridge/amd/cs5536/Kconfig b/src/southbridge/amd/cs5536/Kconfig index 5ebc7c8..8f576ab 100644 --- a/src/southbridge/amd/cs5536/Kconfig +++ b/src/southbridge/amd/cs5536/Kconfig @@ -20,4 +20,3 @@ config SOUTHBRIDGE_AMD_CS5536 bool select UDELAY_TSC - diff --git a/src/southbridge/amd/rs780/Kconfig b/src/southbridge/amd/rs780/Kconfig index ed77c12..ac263f4 100644 --- a/src/southbridge/amd/rs780/Kconfig +++ b/src/southbridge/amd/rs780/Kconfig @@ -19,4 +19,3 @@ config SOUTHBRIDGE_AMD_RS780 bool - diff --git a/src/southbridge/intel/i3100/Kconfig b/src/southbridge/intel/i3100/Kconfig index e0acc63..3b6d178 100644 --- a/src/southbridge/intel/i3100/Kconfig +++ b/src/southbridge/intel/i3100/Kconfig @@ -10,4 +10,3 @@ config HPET_MIN_TICKS default 0x90 endif - diff --git a/src/southbridge/intel/i82371eb/Kconfig b/src/southbridge/intel/i82371eb/Kconfig index d91c8b7..5466b12 100644 --- a/src/southbridge/intel/i82371eb/Kconfig +++ b/src/southbridge/intel/i82371eb/Kconfig @@ -5,4 +5,3 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT string default "southbridge/intel/i82371eb/bootblock.c" depends on SOUTHBRIDGE_INTEL_I82371EB - diff --git a/src/southbridge/intel/i82801ax/Kconfig b/src/southbridge/intel/i82801ax/Kconfig index 839f735..f08808f 100644 --- a/src/southbridge/intel/i82801ax/Kconfig +++ b/src/southbridge/intel/i82801ax/Kconfig @@ -22,4 +22,3 @@ config SOUTHBRIDGE_INTEL_I82801AX select IOAPIC select HAVE_HARD_RESET select USE_WATCHDOG_ON_BOOT - diff --git a/src/southbridge/intel/i82801bx/Kconfig b/src/southbridge/intel/i82801bx/Kconfig index 162f40a..f3609b3 100644 --- a/src/southbridge/intel/i82801bx/Kconfig +++ b/src/southbridge/intel/i82801bx/Kconfig @@ -22,4 +22,3 @@ config SOUTHBRIDGE_INTEL_I82801BX select IOAPIC select HAVE_HARD_RESET select USE_WATCHDOG_ON_BOOT - diff --git a/src/southbridge/intel/i82801gx/Kconfig b/src/southbridge/intel/i82801gx/Kconfig index 777b69b..a050f42 100644 --- a/src/southbridge/intel/i82801gx/Kconfig +++ b/src/southbridge/intel/i82801gx/Kconfig @@ -41,4 +41,3 @@ config HPET_MIN_TICKS default 0x80 endif - diff --git a/src/southbridge/intel/i82801ix/Kconfig b/src/southbridge/intel/i82801ix/Kconfig index 92e7f41..3d538f5 100644 --- a/src/southbridge/intel/i82801ix/Kconfig +++ b/src/southbridge/intel/i82801ix/Kconfig @@ -39,4 +39,3 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT default "southbridge/intel/i82801ix/bootblock.c" endif - diff --git a/src/southbridge/intel/sch/Kconfig b/src/southbridge/intel/sch/Kconfig index d320a53..4ed9155 100644 --- a/src/southbridge/intel/sch/Kconfig +++ b/src/southbridge/intel/sch/Kconfig @@ -51,4 +51,3 @@ config HPET_MIN_TICKS default 0x80 endif - diff --git a/src/southbridge/ricoh/rl5c476/Kconfig b/src/southbridge/ricoh/rl5c476/Kconfig index 1213eb0..8712afd 100644 --- a/src/southbridge/ricoh/rl5c476/Kconfig +++ b/src/southbridge/ricoh/rl5c476/Kconfig @@ -19,4 +19,3 @@ config SOUTHBRIDGE_RICOH_RL5C476 bool - diff --git a/src/southbridge/sis/sis966/Kconfig b/src/southbridge/sis/sis966/Kconfig index 1fbd57d..390589c 100644 --- a/src/southbridge/sis/sis966/Kconfig +++ b/src/southbridge/sis/sis966/Kconfig @@ -11,4 +11,3 @@ config BOOTBLOCK_SOUTHBRIDGE_INIT config EHCI_BAR hex default 0xfef00000 if SOUTHBRIDGE_SIS_SIS966 - diff --git a/src/southbridge/ti/pci7420/Kconfig b/src/southbridge/ti/pci7420/Kconfig index 0413414..2c20057 100644 --- a/src/southbridge/ti/pci7420/Kconfig +++ b/src/southbridge/ti/pci7420/Kconfig @@ -19,4 +19,3 @@ config SOUTHBRIDGE_TI_PCI7420 bool - diff --git a/src/southbridge/ti/pcixx12/Kconfig b/src/southbridge/ti/pcixx12/Kconfig index 91dc1b2..5cc0066 100644 --- a/src/southbridge/ti/pcixx12/Kconfig +++ b/src/southbridge/ti/pcixx12/Kconfig @@ -19,4 +19,3 @@ config SOUTHBRIDGE_TI_PCIXX12 bool - diff --git a/src/southbridge/via/vt8235/Kconfig b/src/southbridge/via/vt8235/Kconfig index 1591274..2ebf814 100644 --- a/src/southbridge/via/vt8235/Kconfig +++ b/src/southbridge/via/vt8235/Kconfig @@ -19,4 +19,3 @@ config SOUTHBRIDGE_VIA_VT8235 bool - diff --git a/util/acpi/acpidump-all b/util/acpi/acpidump-all index aa73a15..62b60b8 100755 --- a/util/acpi/acpidump-all +++ b/util/acpi/acpidump-all @@ -47,4 +47,3 @@ do fi done - diff --git a/util/amdtools/README b/util/amdtools/README index da14bf3..06e6910 100644 --- a/util/amdtools/README +++ b/util/amdtools/README @@ -29,4 +29,3 @@ sample input files from the 'example_input/' directory. -- Ward Vandewege, 2009-10-28. ward(a)jhvc.com - diff --git a/util/amdtools/example_input/lspci-cb-48G-667MHz-18.2-20090909e b/util/amdtools/example_input/lspci-cb-48G-667MHz-18.2-20090909e index a415e76..4af0cb8 100644 --- a/util/amdtools/example_input/lspci-cb-48G-667MHz-18.2-20090909e +++ b/util/amdtools/example_input/lspci-cb-48G-667MHz-18.2-20090909e @@ -17,4 +17,3 @@ c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 d0: 9f 76 62 72 89 83 11 20 21 ad 9d 60 c6 a4 19 00 e0: 8b 12 31 29 c9 42 89 24 40 4a 14 21 c6 24 01 23 f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - diff --git a/util/amdtools/k8-compare-pci-space.pl b/util/amdtools/k8-compare-pci-space.pl index 97ef3e9..ffc4c49 100755 --- a/util/amdtools/k8-compare-pci-space.pl +++ b/util/amdtools/k8-compare-pci-space.pl @@ -308,4 +308,3 @@ sub main { print "</body>\n</html>\n"; } - diff --git a/util/amdtools/k8-interpret-extended-memory-settings.pl b/util/amdtools/k8-interpret-extended-memory-settings.pl index 3ecc2a5..5535a23 100755 --- a/util/amdtools/k8-interpret-extended-memory-settings.pl +++ b/util/amdtools/k8-interpret-extended-memory-settings.pl @@ -245,4 +245,3 @@ sub main { print "</body>\n</html>\n"; } - diff --git a/util/amdtools/k8-read-mem-settings.sh b/util/amdtools/k8-read-mem-settings.sh index a3d607b..a0e6254 100755 --- a/util/amdtools/k8-read-mem-settings.sh +++ b/util/amdtools/k8-read-mem-settings.sh @@ -22,4 +22,3 @@ for OFFSET in 00, 01, 02, 03, 04, 05, 06, 07, 20, 21, 22, 23, 24, 25, 26, 27, 10 echo 0:19.2 9C.l: `setpci -s 0:19.2 9C.l` done - diff --git a/util/board_status/to-wiki/bucketize.sh b/util/board_status/to-wiki/bucketize.sh index a0d2e95..e85fc3e 100755 --- a/util/board_status/to-wiki/bucketize.sh +++ b/util/board_status/to-wiki/bucketize.sh @@ -31,4 +31,3 @@ sort -r -k4 -t/ | while read file; do printf "$file " done printf "\n" - diff --git a/util/cbfstool/cbfs-mkpayload.c b/util/cbfstool/cbfs-mkpayload.c index 67002b0..9602cf1 100644 --- a/util/cbfstool/cbfs-mkpayload.c +++ b/util/cbfstool/cbfs-mkpayload.c @@ -389,4 +389,3 @@ int parse_fv_to_payload(const struct buffer *input, return 0; } - diff --git a/util/cbfstool/cbfs-payload-linux.c b/util/cbfstool/cbfs-payload-linux.c index 33a5e1a..6eb24ea 100644 --- a/util/cbfstool/cbfs-payload-linux.c +++ b/util/cbfstool/cbfs-payload-linux.c @@ -326,5 +326,3 @@ int parse_bzImage_to_payload(const struct buffer *input, xdr_segs(output, bzp.segs, bzp.num_segments); return 0; } - - diff --git a/util/cbfstool/coff.h b/util/cbfstool/coff.h index ee9de4e..e916c3b 100644 --- a/util/cbfstool/coff.h +++ b/util/cbfstool/coff.h @@ -121,4 +121,3 @@ typedef struct { uint32_t number_of_va_and_sizes; /* data directory not needed */ } pe_opt_header_64_t; - diff --git a/util/cbfstool/linux.h b/util/cbfstool/linux.h index 20837e3..baf14d1 100644 --- a/util/cbfstool/linux.h +++ b/util/cbfstool/linux.h @@ -188,4 +188,3 @@ struct linux_params { u8 command_line[COMMAND_LINE_SIZE]; /* 0x800 */ u8 reserved17[1792]; /* 0x900 - 0x1000 */ }; - diff --git a/util/crossgcc/README b/util/crossgcc/README index e4a3e42..6ed1f07 100644 --- a/util/crossgcc/README +++ b/util/crossgcc/README @@ -14,5 +14,3 @@ known broken: alpha-elf arm-elf powerpc64-elf - - diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 5aa98d5..d20f67a 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -639,5 +639,3 @@ else fi printf "\n${green}You can now run your $TARGETARCH cross toolchain from $TARGETDIR.${NC}\n" - - diff --git a/util/getpir/Makefile b/util/getpir/Makefile index 94270f5..8562615 100644 --- a/util/getpir/Makefile +++ b/util/getpir/Makefile @@ -21,4 +21,3 @@ clean: distclean: clean rm -f irq_tables.o irq_tables.c - diff --git a/util/getpir/README b/util/getpir/README index 6514585..42b8dde 100644 --- a/util/getpir/README +++ b/util/getpir/README @@ -27,4 +27,3 @@ Steps Do not run make checkpir and ./checkpir directly because it needs to be linked to irq_table.o first. - diff --git a/util/i915tool/plusplusplus b/util/i915tool/plusplusplus index a5dcd19..ef1d311 100644 --- a/util/i915tool/plusplusplus +++ b/util/i915tool/plusplusplus @@ -1,3 +1,2 @@ #!/bin/bash sed 's,^\+\+\+.*,+++ '$2',' < $1 > $1.pat - diff --git a/util/i915tool/spatches/drm_crtc.cocci b/util/i915tool/spatches/drm_crtc.cocci index 662f253..14042f8 100644 --- a/util/i915tool/spatches/drm_crtc.cocci +++ b/util/i915tool/spatches/drm_crtc.cocci @@ -29,4 +29,3 @@ struct s {... | -struct drm_framebuffer_funcs{...}; ) - diff --git a/util/i915tool/spatches/fx.cocci b/util/i915tool/spatches/fx.cocci index 576cfcc..ac333a6 100644 --- a/util/i915tool/spatches/fx.cocci +++ b/util/i915tool/spatches/fx.cocci @@ -7,4 +7,3 @@ T f(...){... +fprintf(stderr, ...); ...} - diff --git a/util/i915tool/spatches/i915_drv.cocci b/util/i915tool/spatches/i915_drv.cocci index 633e270..2f8d4ec 100644 --- a/util/i915tool/spatches/i915_drv.cocci +++ b/util/i915tool/spatches/i915_drv.cocci @@ -175,4 +175,3 @@ struct s {... -struct drm_i915_fence_reg d[c]; ... }; - diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile index 144028e..4ede450 100644 --- a/util/ifdtool/Makefile +++ b/util/ifdtool/Makefile @@ -50,4 +50,3 @@ install: $(PROGRAM) .PHONY: all clean distclean dep -include .dependencies - diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile index 6682444..df11713 100644 --- a/util/inteltool/Makefile +++ b/util/inteltool/Makefile @@ -87,4 +87,3 @@ install: $(PROGRAM) .PHONY: all clean distclean dep pciutils -include .dependencies - diff --git a/util/inteltool/amb.c b/util/inteltool/amb.c index 13397db..2bd8a96 100644 --- a/util/inteltool/amb.c +++ b/util/inteltool/amb.c @@ -465,5 +465,3 @@ int print_ambs(struct pci_dev *dev, struct pci_access *pacc) unmap_physical((void *)ambconfig, AMB_CONFIG_SPACE_SIZE); return 0; } - - diff --git a/util/inteltool/memory.c b/util/inteltool/memory.c index c755de7..4e76c91 100644 --- a/util/inteltool/memory.c +++ b/util/inteltool/memory.c @@ -323,5 +323,3 @@ int print_mchbar(struct pci_dev *nb, struct pci_access *pacc) unmap_physical((void *)mchbar, size); return 0; } - - diff --git a/util/k8resdump/Makefile b/util/k8resdump/Makefile index e69164f..f82003f 100644 --- a/util/k8resdump/Makefile +++ b/util/k8resdump/Makefile @@ -66,4 +66,3 @@ pciutils: .PHONY: all clean distclean dep pciutils -include .dependencies - diff --git a/util/kconfig/check.sh b/util/kconfig/check.sh index 854d9c7..55b79ba 100644 --- a/util/kconfig/check.sh +++ b/util/kconfig/check.sh @@ -11,4 +11,3 @@ EOF if [ ! "$?" -eq "0" ]; then echo -DKBUILD_NO_NLS; fi - diff --git a/util/kconfig/mconf.c b/util/kconfig/mconf.c index 8d299b8..1c86138 100644 --- a/util/kconfig/mconf.c +++ b/util/kconfig/mconf.c @@ -1034,4 +1034,3 @@ int main(int ac, char **av) return res; } - diff --git a/util/kconfig/nconf.c b/util/kconfig/nconf.c index 4fbecd2..984489e 100644 --- a/util/kconfig/nconf.c +++ b/util/kconfig/nconf.c @@ -1554,4 +1554,3 @@ int main(int ac, char **av) endwin(); return 0; } - diff --git a/util/kconfig/util.c b/util/kconfig/util.c index 960747c..1eb2b37 100644 --- a/util/kconfig/util.c +++ b/util/kconfig/util.c @@ -159,5 +159,3 @@ void *xcalloc(size_t nmemb, size_t size) fprintf(stderr, "Out of memory.\n"); exit(1); } - - diff --git a/util/kconfig/zconf.hash.c_shipped b/util/kconfig/zconf.hash.c_shipped index c77a8ef..7dc7159 100644 --- a/util/kconfig/zconf.hash.c_shipped +++ b/util/kconfig/zconf.hash.c_shipped @@ -286,4 +286,3 @@ kconf_id_lookup (register const char *str, register unsigned int len) return 0; } #line 48 "scripts/kconfig/zconf.gperf" - diff --git a/util/kconfig/zconf.lex.c_shipped b/util/kconfig/zconf.lex.c_shipped index a0521aa..2eed604 100644 --- a/util/kconfig/zconf.lex.c_shipped +++ b/util/kconfig/zconf.lex.c_shipped @@ -2417,4 +2417,3 @@ const char *zconf_curname(void) { return current_pos.file ? current_pos.file->name : "<none>"; } - diff --git a/util/kconfig/zconf.tab.c_shipped b/util/kconfig/zconf.tab.c_shipped index 25ae16a..ba1c433 100644 --- a/util/kconfig/zconf.tab.c_shipped +++ b/util/kconfig/zconf.tab.c_shipped @@ -2535,4 +2535,3 @@ void zconfdump(FILE *out) #include "expr.c" #include "symbol.c" #include "menu.c" - diff --git a/util/lbtdump/Makefile b/util/lbtdump/Makefile index 9e923ae..8ea1244 100644 --- a/util/lbtdump/Makefile +++ b/util/lbtdump/Makefile @@ -10,5 +10,3 @@ $(TARGET): *.c clean: rm -f $(TARGET) - - diff --git a/util/lbtdump/README b/util/lbtdump/README index d8dcaa5..0900588 100644 --- a/util/lbtdump/README +++ b/util/lbtdump/README @@ -4,4 +4,3 @@ to a human readable form. This needs to be run as root (or setuid) on a system running coreboot. - diff --git a/util/lint/lint-stable-002-build-dir-handling b/util/lint/lint-stable-002-build-dir-handling index 013d84a..8e21ae5 100755 --- a/util/lint/lint-stable-002-build-dir-handling +++ b/util/lint/lint-stable-002-build-dir-handling @@ -70,4 +70,3 @@ compare_output "`run_printall /tmp`" "/tmp/.../static.c /tmp/.../static.c /tmp/. compare_output "`run_printall /../tmp`" "/tmp/.../static.c /tmp/.../static.c /tmp/.../static.romstage.o" rm -rf $TMPCONFIG $TMPOBJ - diff --git a/util/lint/lint-stable-003-whitespace b/util/lint/lint-stable-003-whitespace index 1e824a1..ff33756 100755 --- a/util/lint/lint-stable-003-whitespace +++ b/util/lint/lint-stable-003-whitespace @@ -40,4 +40,3 @@ find src util -name .svn -type d -prune -o \ -type f -exec \ grep -l "[[:space:]][[:space:]]*$" {} + | \ sed -e "s,^.*$,File & has lines ending with whitespace.," - diff --git a/util/mkelfImage/configure b/util/mkelfImage/configure index 150e5c8..1719c49 100755 --- a/util/mkelfImage/configure +++ b/util/mkelfImage/configure @@ -6062,6 +6062,3 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi - - - diff --git a/util/mkelfImage/configure.ac b/util/mkelfImage/configure.ac index af0fe19..8121e91 100644 --- a/util/mkelfImage/configure.ac +++ b/util/mkelfImage/configure.ac @@ -229,5 +229,3 @@ AC_SUBST([IA64_LDFLAGS]) dnl ---Output AC_OUTPUT([Makefile.conf]) - - diff --git a/util/mkelfImage/kunzip_src/arch/alpha/lib/Makefile b/util/mkelfImage/kunzip_src/arch/alpha/lib/Makefile index 2fd15b0..6658326 100644 --- a/util/mkelfImage/kunzip_src/arch/alpha/lib/Makefile +++ b/util/mkelfImage/kunzip_src/arch/alpha/lib/Makefile @@ -13,5 +13,3 @@ $(OBJDIR)/__divlu.o: $(SRC)/arch/alpha/lib/divide.S $(OBJDIR)/__remlu.o: $(SRC)/arch/alpha/lib/divide.S $(CC) $(CFLAGS) -DREM -DINTSIZE -c -o $@ $^ - - diff --git a/util/mkelfImage/kunzip_src/lib/inflate.c b/util/mkelfImage/kunzip_src/lib/inflate.c index 82818a6..068186f 100644 --- a/util/mkelfImage/kunzip_src/lib/inflate.c +++ b/util/mkelfImage/kunzip_src/lib/inflate.c @@ -1174,5 +1174,3 @@ int gunzip(void) } return 0; } - - diff --git a/util/mkelfImage/linux-i386/Makefile b/util/mkelfImage/linux-i386/Makefile index 51531d6..944e616 100644 --- a/util/mkelfImage/linux-i386/Makefile +++ b/util/mkelfImage/linux-i386/Makefile @@ -32,4 +32,3 @@ $(LI386_OBJ)/convert_params.o: $(LI386_DIR)/convert_params.c $(LI386_DIR)/conver $(I386_CC) $(I386_CFLAGS) -c -o $@ $< endif - diff --git a/util/mkelfImage/linux-i386/convert_params.c b/util/mkelfImage/linux-i386/convert_params.c index f39e8e0..f8ae224 100644 --- a/util/mkelfImage/linux-i386/convert_params.c +++ b/util/mkelfImage/linux-i386/convert_params.c @@ -1565,4 +1565,3 @@ void *convert_params(unsigned type, void *data, void *param, void *image) #endif return info.real_mode; } - diff --git a/util/mkelfImage/linux-i386/mkelf-linux-i386.c b/util/mkelfImage/linux-i386/mkelf-linux-i386.c index 47256fd..9eb2dca 100644 --- a/util/mkelfImage/linux-i386/mkelf-linux-i386.c +++ b/util/mkelfImage/linux-i386/mkelf-linux-i386.c @@ -463,4 +463,3 @@ int linux_i386_mkelf(int argc, char **argv, return 0; } - diff --git a/util/mkelfImage/linux-ia64/Makefile b/util/mkelfImage/linux-ia64/Makefile index 38f5d8c..be87bdd 100644 --- a/util/mkelfImage/linux-ia64/Makefile +++ b/util/mkelfImage/linux-ia64/Makefile @@ -30,4 +30,3 @@ $(LIA64_OBJ)/convert_params.o: $(LIA64_DIR)/convert_params.c $(LIA64_DIR)/conver endif - diff --git a/util/mkelfImage/linux-ia64/convert.bin.c b/util/mkelfImage/linux-ia64/convert.bin.c index 2b8bcc7..ca0b466 100644 --- a/util/mkelfImage/linux-ia64/convert.bin.c +++ b/util/mkelfImage/linux-ia64/convert.bin.c @@ -307,4 +307,3 @@ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - diff --git a/util/mkelfImage/mkelfImage.spec.in b/util/mkelfImage/mkelfImage.spec.in index 73abe6e..adfbed1 100644 --- a/util/mkelfImage/mkelfImage.spec.in +++ b/util/mkelfImage/mkelfImage.spec.in @@ -47,4 +47,3 @@ make install DESTDIR=${RPM_BUILD_ROOT} * Sat Aug 10 2002 Andrew Ip <aip(a)cwlinux.com> - Initial release - diff --git a/util/msrtool/intel_atom.c b/util/msrtool/intel_atom.c index b53da6a..033631e 100644 --- a/util/msrtool/intel_atom.c +++ b/util/msrtool/intel_atom.c @@ -1145,4 +1145,3 @@ const struct msrdef intel_atom_msrs[] = { }}, { MSR_EOT } }; - diff --git a/util/msrtool/intel_core2_later.c b/util/msrtool/intel_core2_later.c index 80462c1..e6f32cc 100644 --- a/util/msrtool/intel_core2_later.c +++ b/util/msrtool/intel_core2_later.c @@ -1292,5 +1292,3 @@ const struct msrdef intel_core2_later_msrs[] = { }}, { MSR_EOT } }; - - diff --git a/util/msrtool/intel_nehalem.c b/util/msrtool/intel_nehalem.c index 3c2cbf8..f71ee8d 100644 --- a/util/msrtool/intel_nehalem.c +++ b/util/msrtool/intel_nehalem.c @@ -2276,5 +2276,3 @@ const struct msrdef intel_nehalem_msrs[] = { }}, { MSR_EOT } }; - - diff --git a/util/msrtool/intel_pentium4_later.c b/util/msrtool/intel_pentium4_later.c index 5fed62e..ac15141 100644 --- a/util/msrtool/intel_pentium4_later.c +++ b/util/msrtool/intel_pentium4_later.c @@ -341,4 +341,3 @@ const struct msrdef intel_pentium4_later_msrs[] = { }}, { MSR_EOT } }; - diff --git a/util/nvramtool/Makefile.inc b/util/nvramtool/Makefile.inc index dc33370..8d3ef04 100644 --- a/util/nvramtool/Makefile.inc +++ b/util/nvramtool/Makefile.inc @@ -50,5 +50,3 @@ $(objutil)/nvramtool/%.o: $(top)/util/nvramtool/%.c $(objutil)/nvramtool/nvramtool: $(objutil)/nvramtool $(objutil)/nvramtool/accessors $(objutil)/nvramtool/cli $(addprefix $(objutil)/nvramtool/,$(nvramtoolobj)) printf " HOSTCC $(subst $(objutil)/,,$(@)) (link)\n" $(HOSTCC) $(NVRAMTOOLFLAGS) -o $@ $(addprefix $(objutil)/nvramtool/,$(nvramtoolobj)) $(NVRAMTOOLLDFLAGS) - - diff --git a/util/nvramtool/accessors/cmos-hw-unix.c b/util/nvramtool/accessors/cmos-hw-unix.c index 9a39a0c..acefdf7 100644 --- a/util/nvramtool/accessors/cmos-hw-unix.c +++ b/util/nvramtool/accessors/cmos-hw-unix.c @@ -166,4 +166,3 @@ cmos_access_t cmos_hal = { .write = cmos_hal_write, .set_iopl = cmos_set_iopl, }; - diff --git a/util/nvramtool/accessors/cmos-mem.c b/util/nvramtool/accessors/cmos-mem.c index c124cde..619a68a 100644 --- a/util/nvramtool/accessors/cmos-mem.c +++ b/util/nvramtool/accessors/cmos-mem.c @@ -34,4 +34,3 @@ cmos_access_t memory_hal = { .write = mem_hal_write, .set_iopl = mem_set_iopl, }; - diff --git a/util/nvramtool/accessors/layout-bin.c b/util/nvramtool/accessors/layout-bin.c index 4b7f8d6..4195e1a 100644 --- a/util/nvramtool/accessors/layout-bin.c +++ b/util/nvramtool/accessors/layout-bin.c @@ -607,4 +607,3 @@ static const struct lb_record *next_cmos_rec(const struct lb_record *last, return NULL; } - diff --git a/util/nvramtool/cbfs.c b/util/nvramtool/cbfs.c index abd40ee..ba10a46 100644 --- a/util/nvramtool/cbfs.c +++ b/util/nvramtool/cbfs.c @@ -151,4 +151,3 @@ void open_cbfs(const char *filename) } cbfs_offset = cbfs_mapped-(0xffffffff-cbfs_stat.st_size+1); } - diff --git a/util/nvramtool/cbfs.h b/util/nvramtool/cbfs.h index bf5ca95..8f6f2b5 100644 --- a/util/nvramtool/cbfs.h +++ b/util/nvramtool/cbfs.h @@ -178,4 +178,3 @@ void *cbfs_find_file(const char *name, unsigned int type, unsigned int *len); void open_cbfs(const char *filename); #endif - diff --git a/util/nvramtool/hexdump.c b/util/nvramtool/hexdump.c index e6d9faf..4f0023d 100644 --- a/util/nvramtool/hexdump.c +++ b/util/nvramtool/hexdump.c @@ -185,4 +185,3 @@ static void addrprint(FILE * outfile, uint64_t address, int width) fprintf(outfile, ":"); } } - diff --git a/util/nvramtool/lbtable.c b/util/nvramtool/lbtable.c index 5f1f22d..2790934 100644 --- a/util/nvramtool/lbtable.c +++ b/util/nvramtool/lbtable.c @@ -888,4 +888,3 @@ static void string_print_fn(const struct lb_record *rec) p = (const struct lb_string *)rec; printf("%s\n", p->string); } - diff --git a/util/nvramtool/reg_expr.c b/util/nvramtool/reg_expr.c index 7d1adbe..3bd9c1b 100644 --- a/util/nvramtool/reg_expr.c +++ b/util/nvramtool/reg_expr.c @@ -49,4 +49,3 @@ void compile_reg_expr(int cflags, const char *expr, regex_t *reg) exit(1); } } - diff --git a/util/optionlist/Makefile b/util/optionlist/Makefile index 8e78c9a..004a4ad 100644 --- a/util/optionlist/Makefile +++ b/util/optionlist/Makefile @@ -23,4 +23,3 @@ all: clean: rm -rf Options.wiki - diff --git a/util/romcc/Makefile b/util/romcc/Makefile index 8242eb5..fca8112 100644 --- a/util/romcc/Makefile +++ b/util/romcc/Makefile @@ -238,4 +238,3 @@ echo: clean: rm -f romcc romcc_pg core $(TEST_ASM_ALL) $(TEST_OBJ) $(TEST_ELF) tests/*.debug tests/*.debug2 tests/*.gmon.out tests/*.out - diff --git a/util/romcc/tests.sh b/util/romcc/tests.sh index 823d71d..846c1d0 100644 --- a/util/romcc/tests.sh +++ b/util/romcc/tests.sh @@ -65,5 +65,3 @@ if [ '(' -f $base.c ')' -a '(' '!' -f core ')' -a '(' -f $base.S ')' ]; then else /bin/false fi - - diff --git a/util/romcc/tests/fail_test10.c b/util/romcc/tests/fail_test10.c index 7cfd9a9..58e9d8f 100644 --- a/util/romcc/tests/fail_test10.c +++ b/util/romcc/tests/fail_test10.c @@ -16,4 +16,3 @@ static struct result main(int a, int b, struct big_arg d) result.d = a + 1; } - diff --git a/util/romcc/tests/fail_test11.c b/util/romcc/tests/fail_test11.c index 3252060..0b3bf5f 100644 --- a/util/romcc/tests/fail_test11.c +++ b/util/romcc/tests/fail_test11.c @@ -18,4 +18,3 @@ static struct result main(int a, int b, int c, int d) return result; } - diff --git a/util/romcc/tests/fail_test9.c b/util/romcc/tests/fail_test9.c index a24ce9e..d216a6d 100644 --- a/util/romcc/tests/fail_test9.c +++ b/util/romcc/tests/fail_test9.c @@ -6,4 +6,3 @@ static msr_t rdmsr(unsigned long index) } #warning "romcc should die gracefully here" - diff --git a/util/romcc/tests/simple_test10.c b/util/romcc/tests/simple_test10.c index af9bf07..b2e0ba5 100644 --- a/util/romcc/tests/simple_test10.c +++ b/util/romcc/tests/simple_test10.c @@ -28,4 +28,3 @@ static void spd_set_drb(void) device += SMBUS_MEM_DEVICE_INC; } } - diff --git a/util/romcc/tests/simple_test12.c b/util/romcc/tests/simple_test12.c index 52c965f..cbc00c9 100644 --- a/util/romcc/tests/simple_test12.c +++ b/util/romcc/tests/simple_test12.c @@ -6,4 +6,3 @@ static void spd_set_drb(void) ch = *str; __builtin_outb(ch, 0xab); } - diff --git a/util/romcc/tests/simple_test17.c b/util/romcc/tests/simple_test17.c index 2758614..2e3005e 100644 --- a/util/romcc/tests/simple_test17.c +++ b/util/romcc/tests/simple_test17.c @@ -36,4 +36,3 @@ static void main(void) outb(p.i, 0x80); outb(p.j, 0x80); } - diff --git a/util/romcc/tests/simple_test33.c b/util/romcc/tests/simple_test33.c index 4caaa3a..8ca9f8c 100644 --- a/util/romcc/tests/simple_test33.c +++ b/util/romcc/tests/simple_test33.c @@ -37,5 +37,3 @@ static void main(void) accum += loops1 + loops0; } - - diff --git a/util/romcc/tests/simple_test47.c b/util/romcc/tests/simple_test47.c index d1c54ae..2a822d5 100644 --- a/util/romcc/tests/simple_test47.c +++ b/util/romcc/tests/simple_test47.c @@ -40,4 +40,3 @@ static void spd_set_memclk(void) min_latency = new_latency; } } - diff --git a/util/romcc/tests/simple_test5.c b/util/romcc/tests/simple_test5.c index 725d745..976fa3d 100644 --- a/util/romcc/tests/simple_test5.c +++ b/util/romcc/tests/simple_test5.c @@ -307,4 +307,3 @@ void sdram_enable_refresh(void) { spd_enable_refresh(); } - diff --git a/util/romcc/tests/simple_test72.c b/util/romcc/tests/simple_test72.c index 10f6ee9..2dda23a 100644 --- a/util/romcc/tests/simple_test72.c +++ b/util/romcc/tests/simple_test72.c @@ -161,4 +161,3 @@ static void spd_set_memclk(void) } } } - diff --git a/util/romcc/tests/simple_test80.c b/util/romcc/tests/simple_test80.c index 3a31a0a..50a3a2a 100644 --- a/util/romcc/tests/simple_test80.c +++ b/util/romcc/tests/simple_test80.c @@ -10,4 +10,3 @@ static void main(void) msr_t msr; msr = rdmsr(0x12345678); } - diff --git a/util/romcc/tests/simple_test82.c b/util/romcc/tests/simple_test82.c index 25b08ba..a9b7673 100644 --- a/util/romcc/tests/simple_test82.c +++ b/util/romcc/tests/simple_test82.c @@ -14,4 +14,3 @@ static struct result main(int a, int b, int c, int d) return result; } - diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped index 1deb75d..cf67c5a 100644 --- a/util/sconfig/lex.yy.c_shipped +++ b/util/sconfig/lex.yy.c_shipped @@ -1947,4 +1947,3 @@ void yyfree (void * ptr ) } #define YYTABLES_NAME "yytables" - diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped index 3a56ac8..6fb0b74 100644 --- a/util/sconfig/sconfig.tab.c_shipped +++ b/util/sconfig/sconfig.tab.c_shipped @@ -1717,8 +1717,3 @@ yyreturn: /* Make sure YYID is used. */ return YYID (yyresult); } - - - - - diff --git a/util/sconfig/sconfig.tab.h_shipped b/util/sconfig/sconfig.tab.h_shipped index be65179..f2e95a0 100644 --- a/util/sconfig/sconfig.tab.h_shipped +++ b/util/sconfig/sconfig.tab.h_shipped @@ -85,5 +85,3 @@ typedef union YYSTYPE #endif extern YYSTYPE yylval; - - diff --git a/util/superiotool/Makefile b/util/superiotool/Makefile index 7ce5ede..cf2ea52 100644 --- a/util/superiotool/Makefile +++ b/util/superiotool/Makefile @@ -76,4 +76,3 @@ clean: rm -f $(PROGRAM) *.o .PHONY: all install clean - diff --git a/util/vgabios/Makefile b/util/vgabios/Makefile index e187122..0d8ea58 100644 --- a/util/vgabios/Makefile +++ b/util/vgabios/Makefile @@ -38,4 +38,3 @@ clean: %.o: %.c $(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $< - diff --git a/util/vgabios/testbios.c b/util/vgabios/testbios.c index c12e721..a6e121e 100644 --- a/util/vgabios/testbios.c +++ b/util/vgabios/testbios.c @@ -391,4 +391,3 @@ unsigned short get_device(char *arg_val) return devfn; } - diff --git a/util/viatool/Makefile b/util/viatool/Makefile index 5124a73..d931096 100644 --- a/util/viatool/Makefile +++ b/util/viatool/Makefile @@ -96,4 +96,3 @@ install: $(PROGRAM) .PHONY: all clean distclean dep pciutils -include .dependencies - diff --git a/util/viatool/quirks/quirks.h b/util/viatool/quirks/quirks.h index a5a4791..842867b 100644 --- a/util/viatool/quirks/quirks.h +++ b/util/viatool/quirks/quirks.h @@ -35,4 +35,3 @@ struct quirk_list { /* NULL-terminated list of quirks */ struct quirk *dev_quirks; }; - diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile index 01d75bf..aaec10b 100755 --- a/util/xcompile/xcompile +++ b/util/xcompile/xcompile @@ -232,4 +232,3 @@ test_architecture() { for architecture in $SUPPORTED_ARCHITECTURE; do test_architecture $architecture done -

1 0

Patch set updated for coreboot: b39b440 Remove inessential mappings in cbfs_media and re-structuring payload loading
by Naman Govil 06 Aug '14

06 Aug '14

Naman Govil (namangov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6169 -gerrit commit b39b440542911e9b34dd852ee838f718f0b9e123 Author: Naman Govil <namangov(a)gmail.com> Date: Mon Jun 30 22:57:11 2014 +0530 Remove inessential mappings in cbfs_media and re-structuring payload loading Reducing the sram usage while booting by removing unwanted map()s by creating a structure to replace it with appropriate read()s. Removing dependency for mapping entire segments for payload loading by segragating segments by reading metadata and processing them. Change-Id: If503368553308a2fdd3ecc1a312a11f14c7a707f Signed-off-by: Naman Govil <namangov(a)gmail.com> --- src/arch/x86/boot/smbios.c | 8 +- src/include/cbfs_core.h | 32 +++- src/include/payload_loader.h | 4 + src/lib/cbfs.c | 86 ++++++++--- src/lib/cbfs_core.c | 211 +++++++++++++++++-------- src/lib/loaders/cbfs_payload_loader.c | 13 +- src/lib/loaders/load_and_run_payload.c | 3 - src/lib/selfboot.c | 275 ++++++++++++++++++++++++++------- 8 files changed, 462 insertions(+), 170 deletions(-) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index ce47a8b..37c4b80 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -28,7 +28,6 @@ #include <arch/cpu.h> #include <cpu/x86/name.h> #include <cbfs_core.h> -#include <arch/byteorder.h> #include <elog.h> #if CONFIG_CHROMEOS #include <vendorcode/google/chromeos/gnvs.h> @@ -152,11 +151,10 @@ static int smbios_write_type0(unsigned long *current, int handle) #endif { - const struct cbfs_header *header; + struct cbfs_header header; u32 romsize = CONFIG_ROM_SIZE; - header = cbfs_get_header(CBFS_DEFAULT_MEDIA); - if (header != CBFS_HEADER_INVALID_ADDRESS) - romsize = ntohl(header->romsize); + if (!cbfs_get_header(CBFS_DEFAULT_MEDIA, &header)) + romsize = header.romsize; t->bios_rom_size = (romsize / 65535) - 1; } diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h index a1d8127..ecfee36 100644 --- a/src/include/cbfs_core.h +++ b/src/include/cbfs_core.h @@ -4,6 +4,7 @@ * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> * Copyright (C) 2012 Google, Inc. * Copyright (C) 2013 The Chromium OS Authors. All rights reserved. + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * * This file is dual-licensed. You can choose between: * - The GNU GPL, version 2, as published by the Free Software Foundation @@ -189,6 +190,12 @@ struct cbfs_optionrom { #define CBFS_MEDIA_INVALID_MAP_ADDRESS ((void*)(0xffffffff)) #define CBFS_DEFAULT_MEDIA ((void*)(0x0)) +struct cbfs_file_handle { + uint32_t data_offset; + uint32_t data_len; + struct cbfs_file file; +}; + /* Media for CBFS to load files. */ struct cbfs_media { @@ -220,16 +227,29 @@ struct cbfs_media { /* returns pointer to a file entry inside CBFS or NULL */ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name); -/* returns pointer to file content inside CBFS after if type is correct */ -void *cbfs_get_file_content(struct cbfs_media *media, const char *name, - int type, size_t *sz); /* returns decompressed size on success, 0 on failure */ int cbfs_decompress(int algo, void *src, void *dst, int len); -/* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS - * on failure */ -const struct cbfs_header *cbfs_get_header(struct cbfs_media *media); +/* finds the CBFS master header and fills it in a cbfs_header structure, + * return 0 on success and <0 if header not found */ +int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header); + +/* Returns success (0) on finding the file requested by verifying name; + * -1 if file not found + * The absolute data_offset to the file is stored */ +int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name); + +/* Returns success (0) on finding the file requested by verifying name and type; + * -1 if file not found + * The absolute data_offset to the file is stored */ +int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name, int type); + +/* returns pointer to file content inside CBFS after verifying if type is correct */ +void *cbfs_get_file_content(struct cbfs_media *media, const char *name, + int type, size_t *sz); #endif /* __ROMCC__ */ diff --git a/src/include/payload_loader.h b/src/include/payload_loader.h index 7a3f045..cac7d27 100644 --- a/src/include/payload_loader.h +++ b/src/include/payload_loader.h @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2014 Google Inc. + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +22,7 @@ #include <stdint.h> #include <stddef.h> +#include <cbfs_core.h> struct buffer_area { void *data; @@ -32,6 +34,8 @@ struct payload { struct buffer_area backing_store; /* Used when payload wants memory coreboot ramstage is running at. */ struct buffer_area bounce; + struct cbfs_media *media; + struct cbfs_file_handle f; void *entry; }; diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index dc08937..83785cf 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -3,7 +3,7 @@ * * Copyright (C) 2008, Jordan Crouse <jordan(a)cosmicpenguin.net> * Copyright (C) 2013 The Chromium OS Authors. All rights reserved. - * + * Copyright (C) 2014, Naman Govil <namangov(a)gmail.com> * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. @@ -119,39 +119,81 @@ void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor, void * cbfs_load_stage(struct cbfs_media *media, const char *name) { - struct cbfs_stage *stage = (struct cbfs_stage *) - cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, NULL); + struct cbfs_file_handle f; + struct cbfs_stage stage; + int c; + ssize_t value_read; + void * data; + ssize_t v_read; + struct cbfs_media default_media; + void * errorptr = (void *)-1; + + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initialize default media.\n"); + return errorptr; + } + } + + c = cbfs_find_file_by_type(media, &f, name, CBFS_TYPE_STAGE); + + if (c < 0) { + ERROR("Stage not loaded.\n"); + return errorptr; + } + + value_read = media->read(media, &stage, f.data_offset, sizeof(stage)); /* this is a mess. There is no ntohll. */ /* for now, assume compatible byte order until we solve this. */ - uint32_t entry; + if (value_read != sizeof(stage)) + return errorptr; + + void * entry; uint32_t final_size; - if (stage == NULL) - return (void *) -1; + DEBUG("Read Complete @offset = 0x%x and length = %d\n", + f.data_offset, value_read); LOG("loading stage %s @ 0x%x (%d bytes), entry @ 0x%llx\n", name, - (uint32_t) stage->load, stage->memlen, - stage->entry); + (uint32_t) stage.load, stage.memlen, + stage.entry); - final_size = cbfs_decompress(stage->compression, - ((unsigned char *) stage) + - sizeof(struct cbfs_stage), - (void *) (uint32_t) stage->load, - stage->len); - if (!final_size) - return (void *) -1; - /* Stages rely the below clearing so that the bss is initialized. */ - memset((void *)((uintptr_t)stage->load + final_size), 0, - stage->memlen - final_size); + if(stage.compression == CBFS_COMPRESS_NONE) { + //No compression; hence we can directly read + DEBUG("Read Done\n"); + v_read = media->read(media, (void *) (uintptr_t) stage.load, + f.data_offset + sizeof(stage), f.data_len); + if (v_read != f.data_len) + return errorptr; - DEBUG("stage loaded.\n"); + final_size = f.data_len; + } + else { + data = media->map(media, f.data_offset + sizeof(stage), f.data_len); + if (data == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + ERROR("Map not successful"); + return errorptr; + } + + DEBUG("Map Done\n"); + final_size = cbfs_decompress(stage.compression, data, + (void *) (uint32_t) stage.load, + stage.len); + + if (!final_size) + return errorptr; + } - entry = stage->entry; - // entry = ntohll(stage->entry); + /* Stages rely the below clearing so that the bss is initialized. */ + memset((void *)((uintptr_t)stage.load + final_size), 0, + stage.memlen - final_size); - return (void *) entry; + DEBUG("stage loaded.\n"); + entry = (void *)(uintptr_t)stage.entry; + return entry; } /* Simple buffer */ diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c index 50c037e..348ff77 100644 --- a/src/lib/cbfs_core.c +++ b/src/lib/cbfs_core.c @@ -3,6 +3,7 @@ * * Copyright (C) 2011 secunet Security Networks AG * Copyright (C) 2013 The Chromium OS Authors. All rights reserved. + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -52,150 +53,224 @@ #include <cbfs.h> #include <string.h> -/* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS - * on failure */ -const struct cbfs_header *cbfs_get_header(struct cbfs_media *media) +/* fills in the header structure with a pointer to CBFS master header, + returns 0 on success and <0 if header not found */ +int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header) { - const struct cbfs_header *header; struct cbfs_media default_media; + ssize_t header_size; if (media == CBFS_DEFAULT_MEDIA) { media = &default_media; if (init_default_cbfs_media(media) != 0) { ERROR("Failed to initialize default media.\n"); - return CBFS_HEADER_INVALID_ADDRESS; + return -1; } } media->open(media); DEBUG("CBFS_HEADER_ROM_ADDRESS: 0x%x/0x%x\n", CBFS_HEADER_ROM_ADDRESS, CONFIG_ROM_SIZE); - header = media->map(media, CBFS_HEADER_ROM_ADDRESS, sizeof(*header)); + header_size = media->read(media, (void *)header , + CBFS_HEADER_ROM_ADDRESS, sizeof(*header)); media->close(media); - if (header == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + header->offset = ntohl(header->offset); + header->align = ntohl(header->align); + header->romsize = ntohl(header->romsize); + header->magic = ntohl(header->magic); + header->version = ntohl(header->version); + header->architecture = ntohl(header->architecture); + header->bootblocksize = ntohl(header->bootblocksize); + header->pad[1] = ntohl(header->pad[1]); + + if (header_size != sizeof(*header)) { ERROR("Failed to load CBFS header from 0x%x\n", CBFS_HEADER_ROM_ADDRESS); - return CBFS_HEADER_INVALID_ADDRESS; + return -1; } - - if (CBFS_HEADER_MAGIC != ntohl(header->magic)) { + else if (CBFS_HEADER_MAGIC != header->magic) { ERROR("Could not find valid CBFS master header at %x: " "%x vs %x.\n", CBFS_HEADER_ROM_ADDRESS, CBFS_HEADER_MAGIC, - ntohl(header->magic)); + header->magic); if (header->magic == 0xffffffff) { ERROR("Maybe ROM is not mapped properly?\n"); } - return CBFS_HEADER_INVALID_ADDRESS; + return -1; } - return header; + return 0; } /* public API starts here*/ -struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) +/* This functions finds the absolute data_offset of a file searched for by + name. Returns 0 on success and -1 on failure + */ +int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name) { - const char *file_name; - uint32_t offset, align, romsize, name_len; - const struct cbfs_header *header; - struct cbfs_file file, *file_ptr; + uint32_t offset, align, romsize,name_len; struct cbfs_media default_media; + ssize_t value_read; + const char *file_name; + struct cbfs_header header; if (media == CBFS_DEFAULT_MEDIA) { media = &default_media; if (init_default_cbfs_media(media) != 0) { ERROR("Failed to initialize default media.\n"); - return NULL; + return -1; } } - if (CBFS_HEADER_INVALID_ADDRESS == (header = cbfs_get_header(media))) - return NULL; + if (cbfs_get_header(media, &header)) + return -1; - // Logical offset (for source media) of first file. - offset = ntohl(header->offset); - align = ntohl(header->align); - romsize = ntohl(header->romsize); + // Offset (for source media) of first file. + offset = header.offset; + align = header.align; + romsize = header.romsize; - // TODO Add a "size" in CBFS header for a platform independent way to - // determine the end of CBFS data. #if defined(CONFIG_ARCH_X86) && CONFIG_ARCH_X86 - romsize -= htonl(header->bootblocksize); + romsize -= header.bootblocksize; #endif DEBUG("CBFS location: 0x%x~0x%x, align: %d\n", offset, romsize, align); - DEBUG("Looking for '%s' starting from 0x%x.\n", name, offset); media->open(media); - while (offset < romsize && - media->read(media, &file, offset, sizeof(file)) == sizeof(file)) { - if (memcmp(CBFS_FILE_MAGIC, file.magic, - sizeof(file.magic)) != 0) { + while (offset < romsize) + { + value_read = media->read(media, &f->file, offset, sizeof(f->file)); + if(value_read != sizeof(f->file)){ + return -1; + } + f->file.len = ntohl(f->file.len); + f->file.offset = ntohl(f->file.offset); + f->file.type = ntohl(f->file.type); + + if (memcmp(CBFS_FILE_MAGIC, f->file.magic, + sizeof(f->file.magic)) != 0) { uint32_t new_align = align; if (offset % align) new_align += align - (offset % align); - ERROR("ERROR: No file header found at 0x%x - " - "try next aligned address: 0x%x.\n", offset, - offset + new_align); + ERROR("ERROR: No file header found at 0x%x - try next aligned address: 0x%x.\n", offset,offset+new_align); offset += new_align; continue; } - name_len = ntohl(file.offset) - sizeof(file); - DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset, - name_len); - // load file name (arbitrary length). - file_name = (const char *)media->map( - media, offset + sizeof(file), name_len); + name_len = f->file.offset - sizeof(f->file); + DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset,name_len); + file_name = (const char *)media->map(media, offset + sizeof(f->file), + name_len); if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) { ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); } else if (strcmp(file_name, name) == 0) { - int file_offset = ntohl(file.offset), - file_len = ntohl(file.len); - DEBUG("Found file (offset=0x%x, len=%d).\n", - offset + file_offset, file_len); - media->unmap(media, file_name); - file_ptr = media->map(media, offset, - file_offset + file_len); - media->close(media); - return file_ptr; + f->data_offset = offset + f->file.offset; + f->data_len = f->file.len; + media->unmap(media, file_name); + DEBUG("Found file:offset = 0x%x, len=%d\n", + f->data_offset, f->data_len); + return 0; } else { - DEBUG(" (unmatched file @0x%x: %s)\n", offset, - file_name); - media->unmap(media, file_name); + DEBUG("unmatched file offset = 0x%x : %s\n", offset, file_name); + media->unmap(media,file_name); } - // Move to next file. - offset += ntohl(file.len) + ntohl(file.offset); + offset += f->file.len + f->file.offset; if (offset % align) offset += align - (offset % align); + DEBUG("Going for next offset\n"); } media->close(media); - LOG("WARNING: '%s' not found.\n", name); - return NULL; + LOG("Warning: '%s' not found\n",name); + return -1; +} + + +/* This functions finds the absolute data_offset of a file searched for by + name and type using cbfs_find_file(). Returns 0 on success and -1 on failure + */ +int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name, int type) +{ + + if (cbfs_find_file(media, f, name) < 0) { + ERROR("Failed to find file\n"); + return -1; + } + + if (f->file.type == type) { + DEBUG("File of matching type has been found\n"); + return 0; + } + else + return -1; } + +/*Returns pointer to file content inside CBFS after verifying type + */ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, - int type, size_t *sz) + int type, size_t *sz) { - struct cbfs_file *file = cbfs_get_file(media, name); + struct cbfs_file_handle f; + struct cbfs_media default_media; + void *content; if (sz) *sz = 0; - if (file == NULL) { - ERROR("Could not find file '%s'.\n", name); - return NULL; + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initialize default media.\n"); + return NULL; + } } - if (ntohl(file->type) != type) { - ERROR("File '%s' is of type %x, but we requested %x.\n", name, - ntohl(file->type), type); + if (cbfs_find_file_by_type(media, &f, name, type) < 0) { + ERROR("File not found\n"); return NULL; } + DEBUG("Found file. Will be mapping it now!\n"); + if (sz) - *sz = ntohl(file->len); + *sz = f.data_len; + + content = media->map(media, f.data_offset, f.data_len); + + if (content == CBFS_MEDIA_INVALID_MAP_ADDRESS) + return NULL; + else + return content; +} + +/* returns pointer to file entry inside the CBFS or NULL +*/ +struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) +{ + struct cbfs_file_handle f; + struct cbfs_media default_media; + struct cbfs_file *fileptr; - return (void *)CBFS_SUBHEADER(file); + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initialize media\n"); + return NULL; + } + } + + if (cbfs_find_file(media, &f, name) < 0) { + ERROR("Failed to find file\n"); + return NULL; + } + + fileptr = media->map(media, f.data_offset - f.file.offset, f.data_len + f.file.offset); + + if (fileptr == CBFS_MEDIA_INVALID_MAP_ADDRESS) + return NULL; + else + return fileptr; } int cbfs_decompress(int algo, void *src, void *dst, int len) diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c index 2c1d179..2fa42c4 100644 --- a/src/lib/loaders/cbfs_payload_loader.c +++ b/src/lib/loaders/cbfs_payload_loader.c @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2014 Google Inc. + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,21 +20,19 @@ #include <cbfs.h> #include <payload_loader.h> +#include <cbfs_core.h> static int cbfs_locate_payload(struct payload *payload) { - void *buffer; - size_t size; const int type = CBFS_TYPE_PAYLOAD; + struct cbfs_media *m; - buffer = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, payload->name, - type, &size); + m = CBFS_DEFAULT_MEDIA; - if (buffer == NULL) + if (cbfs_find_file_by_type(m, &payload->f, payload->name, type) < 0) return -1; - payload->backing_store.data = buffer; - payload->backing_store.size = size; + payload->media = CBFS_DEFAULT_MEDIA; return 0; } diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c index 2204090..0dcecfb 100644 --- a/src/lib/loaders/load_and_run_payload.c +++ b/src/lib/loaders/load_and_run_payload.c @@ -58,9 +58,6 @@ struct payload *payload_load(void) ops->name); continue; } - printk(BIOS_DEBUG, "%s: located payload @ %p, %zu bytes.\n", - ops->name, payload->backing_store.data, - payload->backing_store.size); break; } diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 8e9e0de..ac092d1 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -3,7 +3,7 @@ * * Copyright (C) 2003 Eric W. Biederman <ebiederm(a)xmission.com> * Copyright (C) 2009 Ron Minnich <rminnich(a)gmail.com> - * + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. @@ -28,6 +28,7 @@ #include <lib.h> #include <bootmem.h> #include <payload_loader.h> +#include <cbfs_core.h> /* from ramstage.ld: */ extern unsigned char _ram_seg; @@ -40,9 +41,9 @@ struct segment { struct segment *next; struct segment *prev; unsigned long s_dstaddr; - unsigned long s_srcaddr; unsigned long s_memsz; unsigned long s_filesz; + unsigned long s_offset; int compression; }; @@ -66,6 +67,102 @@ struct segment { * and much simpler than the general case implemented in kexec. */ +struct sb_helper { + int (*init)(struct sb_helper *sbh, struct payload *payload); + int (*open)(struct payload *payload); + int (*close)(struct payload *payload); + size_t (*read)(struct payload *payload, void *dest, size_t offset, size_t size); + void *(*map)(struct payload *payload, size_t offset, size_t size); + void *sb_media; +}; + +static struct cbfs_media default_media; + +static int init_cbfs(struct sb_helper *sbh, struct payload *payload) +{ + /*Backing store is in use hence no loading via cbfs + */ + if (payload->backing_store.data != NULL) + return 0; + if (payload->media == CBFS_DEFAULT_MEDIA) { + sbh->sb_media = &default_media; + if (init_default_cbfs_media(payload->media) != 0) { + printk(BIOS_ERR, "Failed to initialize media\n"); + return 0; + } + } + return 1; +} + +static size_t cbfs_read(struct payload *payload, void *dest, size_t offset, size_t size) +{ + return payload->media->read(payload->media, dest, offset, size); +} + +static void *cbfs_map(struct payload *payload, size_t offset, size_t size) +{ + return payload->media->map(payload->media, offset, size); +} + +static int cbfs_open(struct payload *payload) +{ + payload->media->open(payload->media); + return 0; +} + +static int cbfs_close(struct payload *payload) +{ + payload->media->close(payload->media); + return 0; +} + +static int init_backing_store(struct sb_helper *sbh, struct payload *payload) +{ + if (payload->backing_store.data != NULL) + return 1; + else + return 0; +} + +static size_t backing_store_read(struct payload *payload, void *dest, size_t offset, size_t size) +{ + memcpy(dest, (void *)payload->backing_store.data + offset, size); + return size; +} + +static void *backing_store_map(struct payload *payload, size_t offset, size_t size) +{ + return (void *)payload->backing_store.data + offset; +} + +static int backing_store_open(struct payload *payload) +{ + return 0; +} + +static int backing_store_close(struct payload *payload) +{ + return 0; +} + +struct sb_helper cbfs_helper = { + .init = init_cbfs, + .open = cbfs_open, + .close = cbfs_close, + .read = cbfs_read, + .map = cbfs_map, + .sb_media = &default_media, +}; + +struct sb_helper backing_store_helper = { + .init = init_backing_store, + .open = backing_store_open, + .close = backing_store_close, + .read = backing_store_read, + .map = backing_store_map, + .sb_media = NULL, +}; + static unsigned long bounce_size, bounce_buffer; static void get_bounce_buffer(unsigned long req_size) @@ -140,7 +237,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) new->s_memsz = len; seg->s_memsz -= len; seg->s_dstaddr += len; - seg->s_srcaddr += len; + seg->s_offset += len; if (seg->s_filesz > len) { new->s_filesz = len; seg->s_filesz -= len; @@ -176,7 +273,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) seg->s_memsz = len; new->s_memsz -= len; new->s_dstaddr += len; - new->s_srcaddr += len; + new->s_offset += len; if (seg->s_filesz > len) { seg->s_filesz = len; new->s_filesz -= len; @@ -212,68 +309,95 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) } +static struct sb_helper *get_selfboot_method(struct payload *payload) +{ + struct sb_helper sbh; + if (cbfs_helper.init(&sbh, payload)) + return &cbfs_helper; + if (backing_store_helper.init(&sbh, payload)) + return &backing_store_helper; + return NULL; +} + static int build_self_segment_list( struct segment *head, struct payload *payload, uintptr_t *entry) { struct segment *new; - struct segment *ptr; - struct cbfs_payload_segment *segment, *first_segment; - struct cbfs_payload *cbfs_payload; - cbfs_payload = payload->backing_store.data; + struct cbfs_payload_segment segment; + unsigned long current_offset; + struct sb_helper *sbh; + + if (payload->media == CBFS_DEFAULT_MEDIA) { + payload->media = &default_media; + if (init_default_cbfs_media(payload->media) != 0) { + printk(BIOS_ERR, "Failed to initialize media\n"); + return -1; + } + } + + sbh = get_selfboot_method(payload); + + if (sbh != NULL) { + memset(head, 0, sizeof(*head)); head->next = head->prev = head; - first_segment = segment = &cbfs_payload->segments; - while(1) { - printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", segment); - switch(segment->type) { + current_offset = payload->f.data_offset; + sbh->open(payload); + + while(sbh->read(payload, &segment, current_offset, sizeof(segment)) + == sizeof(segment)) { + + printk(BIOS_DEBUG, "Reading segment from offset 0x%lx\n", current_offset); + segment.compression = ntohl(segment.compression); + segment.offset = ntohl(segment.offset); + segment.load_addr = ntohll(segment.load_addr); + segment.mem_len = ntohl(segment.mem_len); + segment.len = ntohl(segment.len); + + switch(segment.type) { case PAYLOAD_SEGMENT_PARAMS: printk(BIOS_DEBUG, " parameter section (skipped)\n"); - segment++; + current_offset += sizeof(segment); continue; case PAYLOAD_SEGMENT_CODE: case PAYLOAD_SEGMENT_DATA: printk(BIOS_DEBUG, " %s (compression=%x)\n", - segment->type == PAYLOAD_SEGMENT_CODE ? "code" : "data", - ntohl(segment->compression)); + segment.type == PAYLOAD_SEGMENT_CODE ? "code" : "data", + segment.compression); new = malloc(sizeof(*new)); - new->s_dstaddr = ntohll(segment->load_addr); - new->s_memsz = ntohl(segment->mem_len); - new->compression = ntohl(segment->compression); - - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + ntohl(segment->offset); - new->s_filesz = ntohl(segment->len); - printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + new->s_dstaddr = segment.load_addr; + new->s_memsz = segment.mem_len; + new->compression = segment.compression; + new->s_filesz = segment.len; + new->s_offset = segment.offset; + + printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx src_offset 0x%lx filesize 0x%lx\n", + new->s_dstaddr, new->s_memsz, new->s_offset, new->s_filesz); /* Clean up the values */ if (new->s_filesz > new->s_memsz) { new->s_filesz = new->s_memsz; } - printk(BIOS_DEBUG, " (cleaned up) New segment addr 0x%lx size 0x%lx offset 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + printk(BIOS_DEBUG, " (cleaned up) New segment addr 0x%lx size 0x%lx src_offset 0x%lx filesize 0x%lx\n", + new->s_dstaddr, new->s_memsz, new->s_offset, new->s_filesz); break; case PAYLOAD_SEGMENT_BSS: - printk(BIOS_DEBUG, " BSS 0x%p (%d byte)\n", (void *) - (intptr_t)ntohll(segment->load_addr), - ntohl(segment->mem_len)); + printk(BIOS_DEBUG, " BSS 0x%p (%d byte)\n", + (void *)(intptr_t)segment.load_addr, segment.mem_len); new = malloc(sizeof(*new)); new->s_filesz = 0; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + ntohl(segment->offset); - new->s_dstaddr = ntohll(segment->load_addr); - new->s_memsz = ntohl(segment->mem_len); + new->s_offset = segment.offset; + new->s_dstaddr = segment.load_addr; + new->s_memsz = segment.mem_len; break; case PAYLOAD_SEGMENT_ENTRY: printk(BIOS_DEBUG, " Entry Point 0x%p\n", - (void *)(intptr_t)ntohll(segment->load_addr)); - *entry = ntohll(segment->load_addr); + (void *)(intptr_t)segment.load_addr); + *entry = segment.load_addr; /* Per definition, a payload always has the entry point * as last segment. Thus, we use the occurrence of the * entry point as break condition for the loop. @@ -285,27 +409,26 @@ static int build_self_segment_list( /* We found something that we don't know about. Throw * hands into the sky and run away! */ - printk(BIOS_EMERG, "Bad segment type %x\n", segment->type); + printk(BIOS_EMERG, "Bad segment type %x\n", segment.type); return -1; } /* We have found another CODE, DATA or BSS segment */ - segment++; + current_offset += sizeof(segment); - /* Find place where to insert our segment */ - for(ptr = head->next; ptr != head; ptr = ptr->next) { - if (new->s_srcaddr < ntohll(segment->load_addr)) - break; - } - - /* Order by stream offset */ - new->next = ptr; - new->prev = ptr->prev; - ptr->prev->next = new; - ptr->prev = new; + /* Insert to the end of the list */ + new->next = head; + new->prev = head->prev; + head->prev->next = new; + head->prev = new; } - + sbh->close(payload); return 1; + } + else { + printk(BIOS_ERR, "Failed to build self_segments\n"); + return -1; + } } static int load_self_segments( @@ -315,6 +438,18 @@ static int load_self_segments( struct segment *ptr; const unsigned long one_meg = (1UL << 20); unsigned long bounce_high = lb_end; + struct sb_helper *sbh; + + if (payload->media == CBFS_DEFAULT_MEDIA) { + payload->media = &default_media; + if (init_default_cbfs_media(payload->media) != 0) { + printk(BIOS_ERR, "Failed to initialize media\n"); + return -1; + } + } + + sbh = get_selfboot_method(payload); + if (sbh != NULL) { for(ptr = head->next; ptr != head; ptr = ptr->next) { if (bootmem_region_targets_usable_ram(ptr->s_dstaddr, @@ -362,7 +497,7 @@ static int load_self_segments( payload->bounce.size = bounce_size; for(ptr = head->next; ptr != head; ptr = ptr->next) { - unsigned char *dest, *src; + unsigned char *dest; printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); @@ -378,7 +513,8 @@ static int load_self_segments( /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - src = (unsigned char *)(ptr->s_srcaddr); + size_t v_read; + void *v_map; /* Copy data from the initial buffer */ if (ptr->s_filesz) { @@ -388,14 +524,31 @@ static int load_self_segments( switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk(BIOS_DEBUG, "using LZMA\n"); - len = ulzma(src, dest); + printk(BIOS_DEBUG, "need to map first\n"); + sbh->open(payload); + v_map = sbh->map(payload, payload->f.data_offset + ptr->s_offset, + len); + + sbh->close(payload); + if (v_map == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + printk(BIOS_ERR, "Failed to map\n"); + return -1; + } + len = ulzma(v_map, dest); if (!len) /* Decompression Error. */ return 0; break; } case CBFS_COMPRESS_NONE: { - printk(BIOS_DEBUG, "it's not compressed!\n"); - memcpy(dest, src, len); + printk(BIOS_DEBUG, "it's not compressed! hence read directly\n"); + sbh->open(payload); + v_read = sbh->read(payload, dest, payload->f.data_offset + ptr->s_offset, + len); + sbh->close(payload); + if (v_read != len) { + printk(BIOS_ERR, "Reading of uncompressed segments not successful\n"); + return -1; + } break; } default: @@ -404,11 +557,10 @@ static int load_self_segments( } end = dest + ptr->s_memsz; middle = dest + len; - printk(BIOS_SPEW, "[ 0x%08lx, %08lx, 0x%08lx) <- %08lx\n", + printk(BIOS_SPEW, "[ 0x%08lx, %08lx, 0x%08lx )\n", (unsigned long)dest, (unsigned long)middle, - (unsigned long)end, - (unsigned long)src); + (unsigned long)end); /* Zero the extra bytes between middle & end */ if (middle < end) { @@ -439,6 +591,11 @@ static int load_self_segments( } } return 1; + } + else { + printk(BIOS_ERR, "Failed to load self_segments\n"); + return -1; + } } void *selfload(struct payload *payload)

1 0

Patch set updated for coreboot: 84dee2c Remove unnecessary mappings in cbfs_media and re-structuring payload loading
by Naman Govil 06 Aug '14

06 Aug '14

Naman Govil (namangov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6169 -gerrit commit 84dee2c4ded29713ce3ede80d8208c5c860efffa Author: Naman Govil <namangov(a)gmail.com> Date: Mon Jun 30 22:57:11 2014 +0530 Remove unnecessary mappings in cbfs_media and re-structuring payload loading Reducing the sram usage while booting by removing unwanted map()s by creating a structure to replace it with appropriate read()s Change-Id: If503368553308a2fdd3ecc1a312a11f14c7a707f Signed-off-by: Naman Govil <namangov(a)gmail.com> --- src/arch/x86/boot/smbios.c | 8 +- src/include/cbfs_core.h | 32 +++- src/include/payload_loader.h | 4 + src/lib/cbfs.c | 86 ++++++++--- src/lib/cbfs_core.c | 211 +++++++++++++++++-------- src/lib/loaders/cbfs_payload_loader.c | 13 +- src/lib/loaders/load_and_run_payload.c | 3 - src/lib/selfboot.c | 275 ++++++++++++++++++++++++++------- 8 files changed, 462 insertions(+), 170 deletions(-) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index ce47a8b..37c4b80 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -28,7 +28,6 @@ #include <arch/cpu.h> #include <cpu/x86/name.h> #include <cbfs_core.h> -#include <arch/byteorder.h> #include <elog.h> #if CONFIG_CHROMEOS #include <vendorcode/google/chromeos/gnvs.h> @@ -152,11 +151,10 @@ static int smbios_write_type0(unsigned long *current, int handle) #endif { - const struct cbfs_header *header; + struct cbfs_header header; u32 romsize = CONFIG_ROM_SIZE; - header = cbfs_get_header(CBFS_DEFAULT_MEDIA); - if (header != CBFS_HEADER_INVALID_ADDRESS) - romsize = ntohl(header->romsize); + if (!cbfs_get_header(CBFS_DEFAULT_MEDIA, &header)) + romsize = header.romsize; t->bios_rom_size = (romsize / 65535) - 1; } diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h index a1d8127..ecfee36 100644 --- a/src/include/cbfs_core.h +++ b/src/include/cbfs_core.h @@ -4,6 +4,7 @@ * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> * Copyright (C) 2012 Google, Inc. * Copyright (C) 2013 The Chromium OS Authors. All rights reserved. + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * * This file is dual-licensed. You can choose between: * - The GNU GPL, version 2, as published by the Free Software Foundation @@ -189,6 +190,12 @@ struct cbfs_optionrom { #define CBFS_MEDIA_INVALID_MAP_ADDRESS ((void*)(0xffffffff)) #define CBFS_DEFAULT_MEDIA ((void*)(0x0)) +struct cbfs_file_handle { + uint32_t data_offset; + uint32_t data_len; + struct cbfs_file file; +}; + /* Media for CBFS to load files. */ struct cbfs_media { @@ -220,16 +227,29 @@ struct cbfs_media { /* returns pointer to a file entry inside CBFS or NULL */ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name); -/* returns pointer to file content inside CBFS after if type is correct */ -void *cbfs_get_file_content(struct cbfs_media *media, const char *name, - int type, size_t *sz); /* returns decompressed size on success, 0 on failure */ int cbfs_decompress(int algo, void *src, void *dst, int len); -/* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS - * on failure */ -const struct cbfs_header *cbfs_get_header(struct cbfs_media *media); +/* finds the CBFS master header and fills it in a cbfs_header structure, + * return 0 on success and <0 if header not found */ +int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header); + +/* Returns success (0) on finding the file requested by verifying name; + * -1 if file not found + * The absolute data_offset to the file is stored */ +int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name); + +/* Returns success (0) on finding the file requested by verifying name and type; + * -1 if file not found + * The absolute data_offset to the file is stored */ +int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name, int type); + +/* returns pointer to file content inside CBFS after verifying if type is correct */ +void *cbfs_get_file_content(struct cbfs_media *media, const char *name, + int type, size_t *sz); #endif /* __ROMCC__ */ diff --git a/src/include/payload_loader.h b/src/include/payload_loader.h index 7a3f045..cac7d27 100644 --- a/src/include/payload_loader.h +++ b/src/include/payload_loader.h @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2014 Google Inc. + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,6 +22,7 @@ #include <stdint.h> #include <stddef.h> +#include <cbfs_core.h> struct buffer_area { void *data; @@ -32,6 +34,8 @@ struct payload { struct buffer_area backing_store; /* Used when payload wants memory coreboot ramstage is running at. */ struct buffer_area bounce; + struct cbfs_media *media; + struct cbfs_file_handle f; void *entry; }; diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index dc08937..05c201b 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -3,7 +3,7 @@ * * Copyright (C) 2008, Jordan Crouse <jordan(a)cosmicpenguin.net> * Copyright (C) 2013 The Chromium OS Authors. All rights reserved. - * + * Copyright (C) 2014, Naman Govil <namangov(a)gmail.com> * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. @@ -119,39 +119,81 @@ void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor, void * cbfs_load_stage(struct cbfs_media *media, const char *name) { - struct cbfs_stage *stage = (struct cbfs_stage *) - cbfs_get_file_content(media, name, CBFS_TYPE_STAGE, NULL); + struct cbfs_file_handle f; + struct cbfs_stage stage; + int c; + ssize_t value_read; + void * data; + ssize_t v_read; + struct cbfs_media default_media; + const void * errorptr = (void *)-1; + + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initialize default media.\n"); + return errorptr; + } + } + + c = cbfs_find_file_by_type(media, &f, name, CBFS_TYPE_STAGE); + + if (c < 0) { + ERROR("Stage not loaded.\n"); + return errorptr; + } + + value_read = media->read(media, &stage, f.data_offset, sizeof(stage)); /* this is a mess. There is no ntohll. */ /* for now, assume compatible byte order until we solve this. */ - uint32_t entry; + if (value_read != sizeof(stage)) + return errorptr; + + void * entry; uint32_t final_size; - if (stage == NULL) - return (void *) -1; + DEBUG("Read Complete @offset = 0x%x and length = %d\n", + f.data_offset, value_read); LOG("loading stage %s @ 0x%x (%d bytes), entry @ 0x%llx\n", name, - (uint32_t) stage->load, stage->memlen, - stage->entry); + (uint32_t) stage.load, stage.memlen, + stage.entry); - final_size = cbfs_decompress(stage->compression, - ((unsigned char *) stage) + - sizeof(struct cbfs_stage), - (void *) (uint32_t) stage->load, - stage->len); - if (!final_size) - return (void *) -1; - /* Stages rely the below clearing so that the bss is initialized. */ - memset((void *)((uintptr_t)stage->load + final_size), 0, - stage->memlen - final_size); + if(stage.compression == CBFS_COMPRESS_NONE) { + //No compression; hence we can directly read + DEBUG("Read Done\n"); + v_read = media->read(media, (void *) (uintptr_t) stage.load, + f.data_offset + sizeof(stage), f.data_len); + if (v_read != f.data_len) + return errorptr; - DEBUG("stage loaded.\n"); + final_size = f.data_len; + } + else { + data = media->map(media, f.data_offset + sizeof(stage), f.data_len); + if (data == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + ERROR("Map not successful"); + return errorptr; + } + + DEBUG("Map Done\n"); + final_size = cbfs_decompress(stage.compression, data, + (void *) (uint32_t) stage.load, + stage.len); + + if (!final_size) + return errorptr; + } - entry = stage->entry; - // entry = ntohll(stage->entry); + /* Stages rely the below clearing so that the bss is initialized. */ + memset((void *)((uintptr_t)stage.load + final_size), 0, + stage.memlen - final_size); - return (void *) entry; + DEBUG("stage loaded.\n"); + entry = (void *)(uintptr_t)stage.entry; + return entry; } /* Simple buffer */ diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c index 50c037e..348ff77 100644 --- a/src/lib/cbfs_core.c +++ b/src/lib/cbfs_core.c @@ -3,6 +3,7 @@ * * Copyright (C) 2011 secunet Security Networks AG * Copyright (C) 2013 The Chromium OS Authors. All rights reserved. + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -52,150 +53,224 @@ #include <cbfs.h> #include <string.h> -/* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS - * on failure */ -const struct cbfs_header *cbfs_get_header(struct cbfs_media *media) +/* fills in the header structure with a pointer to CBFS master header, + returns 0 on success and <0 if header not found */ +int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header) { - const struct cbfs_header *header; struct cbfs_media default_media; + ssize_t header_size; if (media == CBFS_DEFAULT_MEDIA) { media = &default_media; if (init_default_cbfs_media(media) != 0) { ERROR("Failed to initialize default media.\n"); - return CBFS_HEADER_INVALID_ADDRESS; + return -1; } } media->open(media); DEBUG("CBFS_HEADER_ROM_ADDRESS: 0x%x/0x%x\n", CBFS_HEADER_ROM_ADDRESS, CONFIG_ROM_SIZE); - header = media->map(media, CBFS_HEADER_ROM_ADDRESS, sizeof(*header)); + header_size = media->read(media, (void *)header , + CBFS_HEADER_ROM_ADDRESS, sizeof(*header)); media->close(media); - if (header == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + header->offset = ntohl(header->offset); + header->align = ntohl(header->align); + header->romsize = ntohl(header->romsize); + header->magic = ntohl(header->magic); + header->version = ntohl(header->version); + header->architecture = ntohl(header->architecture); + header->bootblocksize = ntohl(header->bootblocksize); + header->pad[1] = ntohl(header->pad[1]); + + if (header_size != sizeof(*header)) { ERROR("Failed to load CBFS header from 0x%x\n", CBFS_HEADER_ROM_ADDRESS); - return CBFS_HEADER_INVALID_ADDRESS; + return -1; } - - if (CBFS_HEADER_MAGIC != ntohl(header->magic)) { + else if (CBFS_HEADER_MAGIC != header->magic) { ERROR("Could not find valid CBFS master header at %x: " "%x vs %x.\n", CBFS_HEADER_ROM_ADDRESS, CBFS_HEADER_MAGIC, - ntohl(header->magic)); + header->magic); if (header->magic == 0xffffffff) { ERROR("Maybe ROM is not mapped properly?\n"); } - return CBFS_HEADER_INVALID_ADDRESS; + return -1; } - return header; + return 0; } /* public API starts here*/ -struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) +/* This functions finds the absolute data_offset of a file searched for by + name. Returns 0 on success and -1 on failure + */ +int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name) { - const char *file_name; - uint32_t offset, align, romsize, name_len; - const struct cbfs_header *header; - struct cbfs_file file, *file_ptr; + uint32_t offset, align, romsize,name_len; struct cbfs_media default_media; + ssize_t value_read; + const char *file_name; + struct cbfs_header header; if (media == CBFS_DEFAULT_MEDIA) { media = &default_media; if (init_default_cbfs_media(media) != 0) { ERROR("Failed to initialize default media.\n"); - return NULL; + return -1; } } - if (CBFS_HEADER_INVALID_ADDRESS == (header = cbfs_get_header(media))) - return NULL; + if (cbfs_get_header(media, &header)) + return -1; - // Logical offset (for source media) of first file. - offset = ntohl(header->offset); - align = ntohl(header->align); - romsize = ntohl(header->romsize); + // Offset (for source media) of first file. + offset = header.offset; + align = header.align; + romsize = header.romsize; - // TODO Add a "size" in CBFS header for a platform independent way to - // determine the end of CBFS data. #if defined(CONFIG_ARCH_X86) && CONFIG_ARCH_X86 - romsize -= htonl(header->bootblocksize); + romsize -= header.bootblocksize; #endif DEBUG("CBFS location: 0x%x~0x%x, align: %d\n", offset, romsize, align); - DEBUG("Looking for '%s' starting from 0x%x.\n", name, offset); media->open(media); - while (offset < romsize && - media->read(media, &file, offset, sizeof(file)) == sizeof(file)) { - if (memcmp(CBFS_FILE_MAGIC, file.magic, - sizeof(file.magic)) != 0) { + while (offset < romsize) + { + value_read = media->read(media, &f->file, offset, sizeof(f->file)); + if(value_read != sizeof(f->file)){ + return -1; + } + f->file.len = ntohl(f->file.len); + f->file.offset = ntohl(f->file.offset); + f->file.type = ntohl(f->file.type); + + if (memcmp(CBFS_FILE_MAGIC, f->file.magic, + sizeof(f->file.magic)) != 0) { uint32_t new_align = align; if (offset % align) new_align += align - (offset % align); - ERROR("ERROR: No file header found at 0x%x - " - "try next aligned address: 0x%x.\n", offset, - offset + new_align); + ERROR("ERROR: No file header found at 0x%x - try next aligned address: 0x%x.\n", offset,offset+new_align); offset += new_align; continue; } - name_len = ntohl(file.offset) - sizeof(file); - DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset, - name_len); - // load file name (arbitrary length). - file_name = (const char *)media->map( - media, offset + sizeof(file), name_len); + name_len = f->file.offset - sizeof(f->file); + DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset,name_len); + file_name = (const char *)media->map(media, offset + sizeof(f->file), + name_len); if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) { ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); } else if (strcmp(file_name, name) == 0) { - int file_offset = ntohl(file.offset), - file_len = ntohl(file.len); - DEBUG("Found file (offset=0x%x, len=%d).\n", - offset + file_offset, file_len); - media->unmap(media, file_name); - file_ptr = media->map(media, offset, - file_offset + file_len); - media->close(media); - return file_ptr; + f->data_offset = offset + f->file.offset; + f->data_len = f->file.len; + media->unmap(media, file_name); + DEBUG("Found file:offset = 0x%x, len=%d\n", + f->data_offset, f->data_len); + return 0; } else { - DEBUG(" (unmatched file @0x%x: %s)\n", offset, - file_name); - media->unmap(media, file_name); + DEBUG("unmatched file offset = 0x%x : %s\n", offset, file_name); + media->unmap(media,file_name); } - // Move to next file. - offset += ntohl(file.len) + ntohl(file.offset); + offset += f->file.len + f->file.offset; if (offset % align) offset += align - (offset % align); + DEBUG("Going for next offset\n"); } media->close(media); - LOG("WARNING: '%s' not found.\n", name); - return NULL; + LOG("Warning: '%s' not found\n",name); + return -1; +} + + +/* This functions finds the absolute data_offset of a file searched for by + name and type using cbfs_find_file(). Returns 0 on success and -1 on failure + */ +int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, + const char *name, int type) +{ + + if (cbfs_find_file(media, f, name) < 0) { + ERROR("Failed to find file\n"); + return -1; + } + + if (f->file.type == type) { + DEBUG("File of matching type has been found\n"); + return 0; + } + else + return -1; } + +/*Returns pointer to file content inside CBFS after verifying type + */ void *cbfs_get_file_content(struct cbfs_media *media, const char *name, - int type, size_t *sz) + int type, size_t *sz) { - struct cbfs_file *file = cbfs_get_file(media, name); + struct cbfs_file_handle f; + struct cbfs_media default_media; + void *content; if (sz) *sz = 0; - if (file == NULL) { - ERROR("Could not find file '%s'.\n", name); - return NULL; + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initialize default media.\n"); + return NULL; + } } - if (ntohl(file->type) != type) { - ERROR("File '%s' is of type %x, but we requested %x.\n", name, - ntohl(file->type), type); + if (cbfs_find_file_by_type(media, &f, name, type) < 0) { + ERROR("File not found\n"); return NULL; } + DEBUG("Found file. Will be mapping it now!\n"); + if (sz) - *sz = ntohl(file->len); + *sz = f.data_len; + + content = media->map(media, f.data_offset, f.data_len); + + if (content == CBFS_MEDIA_INVALID_MAP_ADDRESS) + return NULL; + else + return content; +} + +/* returns pointer to file entry inside the CBFS or NULL +*/ +struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) +{ + struct cbfs_file_handle f; + struct cbfs_media default_media; + struct cbfs_file *fileptr; - return (void *)CBFS_SUBHEADER(file); + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initialize media\n"); + return NULL; + } + } + + if (cbfs_find_file(media, &f, name) < 0) { + ERROR("Failed to find file\n"); + return NULL; + } + + fileptr = media->map(media, f.data_offset - f.file.offset, f.data_len + f.file.offset); + + if (fileptr == CBFS_MEDIA_INVALID_MAP_ADDRESS) + return NULL; + else + return fileptr; } int cbfs_decompress(int algo, void *src, void *dst, int len) diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c index 2c1d179..2fa42c4 100644 --- a/src/lib/loaders/cbfs_payload_loader.c +++ b/src/lib/loaders/cbfs_payload_loader.c @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2014 Google Inc. + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -19,21 +20,19 @@ #include <cbfs.h> #include <payload_loader.h> +#include <cbfs_core.h> static int cbfs_locate_payload(struct payload *payload) { - void *buffer; - size_t size; const int type = CBFS_TYPE_PAYLOAD; + struct cbfs_media *m; - buffer = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, payload->name, - type, &size); + m = CBFS_DEFAULT_MEDIA; - if (buffer == NULL) + if (cbfs_find_file_by_type(m, &payload->f, payload->name, type) < 0) return -1; - payload->backing_store.data = buffer; - payload->backing_store.size = size; + payload->media = CBFS_DEFAULT_MEDIA; return 0; } diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c index 2204090..0dcecfb 100644 --- a/src/lib/loaders/load_and_run_payload.c +++ b/src/lib/loaders/load_and_run_payload.c @@ -58,9 +58,6 @@ struct payload *payload_load(void) ops->name); continue; } - printk(BIOS_DEBUG, "%s: located payload @ %p, %zu bytes.\n", - ops->name, payload->backing_store.data, - payload->backing_store.size); break; } diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 8e9e0de..ac092d1 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -3,7 +3,7 @@ * * Copyright (C) 2003 Eric W. Biederman <ebiederm(a)xmission.com> * Copyright (C) 2009 Ron Minnich <rminnich(a)gmail.com> - * + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; version 2 of the License. @@ -28,6 +28,7 @@ #include <lib.h> #include <bootmem.h> #include <payload_loader.h> +#include <cbfs_core.h> /* from ramstage.ld: */ extern unsigned char _ram_seg; @@ -40,9 +41,9 @@ struct segment { struct segment *next; struct segment *prev; unsigned long s_dstaddr; - unsigned long s_srcaddr; unsigned long s_memsz; unsigned long s_filesz; + unsigned long s_offset; int compression; }; @@ -66,6 +67,102 @@ struct segment { * and much simpler than the general case implemented in kexec. */ +struct sb_helper { + int (*init)(struct sb_helper *sbh, struct payload *payload); + int (*open)(struct payload *payload); + int (*close)(struct payload *payload); + size_t (*read)(struct payload *payload, void *dest, size_t offset, size_t size); + void *(*map)(struct payload *payload, size_t offset, size_t size); + void *sb_media; +}; + +static struct cbfs_media default_media; + +static int init_cbfs(struct sb_helper *sbh, struct payload *payload) +{ + /*Backing store is in use hence no loading via cbfs + */ + if (payload->backing_store.data != NULL) + return 0; + if (payload->media == CBFS_DEFAULT_MEDIA) { + sbh->sb_media = &default_media; + if (init_default_cbfs_media(payload->media) != 0) { + printk(BIOS_ERR, "Failed to initialize media\n"); + return 0; + } + } + return 1; +} + +static size_t cbfs_read(struct payload *payload, void *dest, size_t offset, size_t size) +{ + return payload->media->read(payload->media, dest, offset, size); +} + +static void *cbfs_map(struct payload *payload, size_t offset, size_t size) +{ + return payload->media->map(payload->media, offset, size); +} + +static int cbfs_open(struct payload *payload) +{ + payload->media->open(payload->media); + return 0; +} + +static int cbfs_close(struct payload *payload) +{ + payload->media->close(payload->media); + return 0; +} + +static int init_backing_store(struct sb_helper *sbh, struct payload *payload) +{ + if (payload->backing_store.data != NULL) + return 1; + else + return 0; +} + +static size_t backing_store_read(struct payload *payload, void *dest, size_t offset, size_t size) +{ + memcpy(dest, (void *)payload->backing_store.data + offset, size); + return size; +} + +static void *backing_store_map(struct payload *payload, size_t offset, size_t size) +{ + return (void *)payload->backing_store.data + offset; +} + +static int backing_store_open(struct payload *payload) +{ + return 0; +} + +static int backing_store_close(struct payload *payload) +{ + return 0; +} + +struct sb_helper cbfs_helper = { + .init = init_cbfs, + .open = cbfs_open, + .close = cbfs_close, + .read = cbfs_read, + .map = cbfs_map, + .sb_media = &default_media, +}; + +struct sb_helper backing_store_helper = { + .init = init_backing_store, + .open = backing_store_open, + .close = backing_store_close, + .read = backing_store_read, + .map = backing_store_map, + .sb_media = NULL, +}; + static unsigned long bounce_size, bounce_buffer; static void get_bounce_buffer(unsigned long req_size) @@ -140,7 +237,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) new->s_memsz = len; seg->s_memsz -= len; seg->s_dstaddr += len; - seg->s_srcaddr += len; + seg->s_offset += len; if (seg->s_filesz > len) { new->s_filesz = len; seg->s_filesz -= len; @@ -176,7 +273,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) seg->s_memsz = len; new->s_memsz -= len; new->s_dstaddr += len; - new->s_srcaddr += len; + new->s_offset += len; if (seg->s_filesz > len) { seg->s_filesz = len; new->s_filesz -= len; @@ -212,68 +309,95 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) } +static struct sb_helper *get_selfboot_method(struct payload *payload) +{ + struct sb_helper sbh; + if (cbfs_helper.init(&sbh, payload)) + return &cbfs_helper; + if (backing_store_helper.init(&sbh, payload)) + return &backing_store_helper; + return NULL; +} + static int build_self_segment_list( struct segment *head, struct payload *payload, uintptr_t *entry) { struct segment *new; - struct segment *ptr; - struct cbfs_payload_segment *segment, *first_segment; - struct cbfs_payload *cbfs_payload; - cbfs_payload = payload->backing_store.data; + struct cbfs_payload_segment segment; + unsigned long current_offset; + struct sb_helper *sbh; + + if (payload->media == CBFS_DEFAULT_MEDIA) { + payload->media = &default_media; + if (init_default_cbfs_media(payload->media) != 0) { + printk(BIOS_ERR, "Failed to initialize media\n"); + return -1; + } + } + + sbh = get_selfboot_method(payload); + + if (sbh != NULL) { + memset(head, 0, sizeof(*head)); head->next = head->prev = head; - first_segment = segment = &cbfs_payload->segments; - while(1) { - printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", segment); - switch(segment->type) { + current_offset = payload->f.data_offset; + sbh->open(payload); + + while(sbh->read(payload, &segment, current_offset, sizeof(segment)) + == sizeof(segment)) { + + printk(BIOS_DEBUG, "Reading segment from offset 0x%lx\n", current_offset); + segment.compression = ntohl(segment.compression); + segment.offset = ntohl(segment.offset); + segment.load_addr = ntohll(segment.load_addr); + segment.mem_len = ntohl(segment.mem_len); + segment.len = ntohl(segment.len); + + switch(segment.type) { case PAYLOAD_SEGMENT_PARAMS: printk(BIOS_DEBUG, " parameter section (skipped)\n"); - segment++; + current_offset += sizeof(segment); continue; case PAYLOAD_SEGMENT_CODE: case PAYLOAD_SEGMENT_DATA: printk(BIOS_DEBUG, " %s (compression=%x)\n", - segment->type == PAYLOAD_SEGMENT_CODE ? "code" : "data", - ntohl(segment->compression)); + segment.type == PAYLOAD_SEGMENT_CODE ? "code" : "data", + segment.compression); new = malloc(sizeof(*new)); - new->s_dstaddr = ntohll(segment->load_addr); - new->s_memsz = ntohl(segment->mem_len); - new->compression = ntohl(segment->compression); - - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + ntohl(segment->offset); - new->s_filesz = ntohl(segment->len); - printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + new->s_dstaddr = segment.load_addr; + new->s_memsz = segment.mem_len; + new->compression = segment.compression; + new->s_filesz = segment.len; + new->s_offset = segment.offset; + + printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx src_offset 0x%lx filesize 0x%lx\n", + new->s_dstaddr, new->s_memsz, new->s_offset, new->s_filesz); /* Clean up the values */ if (new->s_filesz > new->s_memsz) { new->s_filesz = new->s_memsz; } - printk(BIOS_DEBUG, " (cleaned up) New segment addr 0x%lx size 0x%lx offset 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + printk(BIOS_DEBUG, " (cleaned up) New segment addr 0x%lx size 0x%lx src_offset 0x%lx filesize 0x%lx\n", + new->s_dstaddr, new->s_memsz, new->s_offset, new->s_filesz); break; case PAYLOAD_SEGMENT_BSS: - printk(BIOS_DEBUG, " BSS 0x%p (%d byte)\n", (void *) - (intptr_t)ntohll(segment->load_addr), - ntohl(segment->mem_len)); + printk(BIOS_DEBUG, " BSS 0x%p (%d byte)\n", + (void *)(intptr_t)segment.load_addr, segment.mem_len); new = malloc(sizeof(*new)); new->s_filesz = 0; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + ntohl(segment->offset); - new->s_dstaddr = ntohll(segment->load_addr); - new->s_memsz = ntohl(segment->mem_len); + new->s_offset = segment.offset; + new->s_dstaddr = segment.load_addr; + new->s_memsz = segment.mem_len; break; case PAYLOAD_SEGMENT_ENTRY: printk(BIOS_DEBUG, " Entry Point 0x%p\n", - (void *)(intptr_t)ntohll(segment->load_addr)); - *entry = ntohll(segment->load_addr); + (void *)(intptr_t)segment.load_addr); + *entry = segment.load_addr; /* Per definition, a payload always has the entry point * as last segment. Thus, we use the occurrence of the * entry point as break condition for the loop. @@ -285,27 +409,26 @@ static int build_self_segment_list( /* We found something that we don't know about. Throw * hands into the sky and run away! */ - printk(BIOS_EMERG, "Bad segment type %x\n", segment->type); + printk(BIOS_EMERG, "Bad segment type %x\n", segment.type); return -1; } /* We have found another CODE, DATA or BSS segment */ - segment++; + current_offset += sizeof(segment); - /* Find place where to insert our segment */ - for(ptr = head->next; ptr != head; ptr = ptr->next) { - if (new->s_srcaddr < ntohll(segment->load_addr)) - break; - } - - /* Order by stream offset */ - new->next = ptr; - new->prev = ptr->prev; - ptr->prev->next = new; - ptr->prev = new; + /* Insert to the end of the list */ + new->next = head; + new->prev = head->prev; + head->prev->next = new; + head->prev = new; } - + sbh->close(payload); return 1; + } + else { + printk(BIOS_ERR, "Failed to build self_segments\n"); + return -1; + } } static int load_self_segments( @@ -315,6 +438,18 @@ static int load_self_segments( struct segment *ptr; const unsigned long one_meg = (1UL << 20); unsigned long bounce_high = lb_end; + struct sb_helper *sbh; + + if (payload->media == CBFS_DEFAULT_MEDIA) { + payload->media = &default_media; + if (init_default_cbfs_media(payload->media) != 0) { + printk(BIOS_ERR, "Failed to initialize media\n"); + return -1; + } + } + + sbh = get_selfboot_method(payload); + if (sbh != NULL) { for(ptr = head->next; ptr != head; ptr = ptr->next) { if (bootmem_region_targets_usable_ram(ptr->s_dstaddr, @@ -362,7 +497,7 @@ static int load_self_segments( payload->bounce.size = bounce_size; for(ptr = head->next; ptr != head; ptr = ptr->next) { - unsigned char *dest, *src; + unsigned char *dest; printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); @@ -378,7 +513,8 @@ static int load_self_segments( /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - src = (unsigned char *)(ptr->s_srcaddr); + size_t v_read; + void *v_map; /* Copy data from the initial buffer */ if (ptr->s_filesz) { @@ -388,14 +524,31 @@ static int load_self_segments( switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk(BIOS_DEBUG, "using LZMA\n"); - len = ulzma(src, dest); + printk(BIOS_DEBUG, "need to map first\n"); + sbh->open(payload); + v_map = sbh->map(payload, payload->f.data_offset + ptr->s_offset, + len); + + sbh->close(payload); + if (v_map == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + printk(BIOS_ERR, "Failed to map\n"); + return -1; + } + len = ulzma(v_map, dest); if (!len) /* Decompression Error. */ return 0; break; } case CBFS_COMPRESS_NONE: { - printk(BIOS_DEBUG, "it's not compressed!\n"); - memcpy(dest, src, len); + printk(BIOS_DEBUG, "it's not compressed! hence read directly\n"); + sbh->open(payload); + v_read = sbh->read(payload, dest, payload->f.data_offset + ptr->s_offset, + len); + sbh->close(payload); + if (v_read != len) { + printk(BIOS_ERR, "Reading of uncompressed segments not successful\n"); + return -1; + } break; } default: @@ -404,11 +557,10 @@ static int load_self_segments( } end = dest + ptr->s_memsz; middle = dest + len; - printk(BIOS_SPEW, "[ 0x%08lx, %08lx, 0x%08lx) <- %08lx\n", + printk(BIOS_SPEW, "[ 0x%08lx, %08lx, 0x%08lx )\n", (unsigned long)dest, (unsigned long)middle, - (unsigned long)end, - (unsigned long)src); + (unsigned long)end); /* Zero the extra bytes between middle & end */ if (middle < end) { @@ -439,6 +591,11 @@ static int load_self_segments( } } return 1; + } + else { + printk(BIOS_ERR, "Failed to load self_segments\n"); + return -1; + } } void *selfload(struct payload *payload)

1 0

Patch set updated for coreboot: 0184f54 Remove inessential mappings in cbfs_media
by Naman Govil 06 Aug '14

06 Aug '14

Naman Govil (namangov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6507 -gerrit commit 0184f54cd44ca542f49adc661a2eed7032298746 Author: Naman Govil <namangov(a)gmail.com> Date: Wed Aug 6 11:46:17 2014 +0530 Remove inessential mappings in cbfs_media Reducing sram usage while booting by removing unwanted map()s by creating a structure to replace it with appropriate read()s Change-Id: I6e49543f5bb30936162ebea11a3ca8cee8213dc2 Signed-off-by: Naman Govil <namangov(a)gmail.com> --- src/arch/x86/boot/smbios.c | 3 +-- src/include/cbfs_core.h | 10 +++++----- src/lib/cbfs.c | 21 +++++++++++---------- src/lib/cbfs_core.c | 20 ++++++-------------- src/lib/loaders/cbfs_payload_loader.c | 6 ++---- 5 files changed, 25 insertions(+), 35 deletions(-) diff --git a/src/arch/x86/boot/smbios.c b/src/arch/x86/boot/smbios.c index ec3e5e8..37c4b80 100644 --- a/src/arch/x86/boot/smbios.c +++ b/src/arch/x86/boot/smbios.c @@ -153,9 +153,8 @@ static int smbios_write_type0(unsigned long *current, int handle) { struct cbfs_header header; u32 romsize = CONFIG_ROM_SIZE; - if (!cbfs_get_header(CBFS_DEFAULT_MEDIA, &header)) { + if (!cbfs_get_header(CBFS_DEFAULT_MEDIA, &header)) romsize = header.romsize; - } t->bios_rom_size = (romsize / 65535) - 1; } diff --git a/src/include/cbfs_core.h b/src/include/cbfs_core.h index 11de0ee..ecfee36 100644 --- a/src/include/cbfs_core.h +++ b/src/include/cbfs_core.h @@ -232,18 +232,18 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name); int cbfs_decompress(int algo, void *src, void *dst, int len); /* finds the CBFS master header and fills it in a cbfs_header structure, - return 0 on success and <0 if header not found */ + * return 0 on success and <0 if header not found */ int cbfs_get_header(struct cbfs_media *media, struct cbfs_header *header); /* Returns success (0) on finding the file requested by verifying name; - -1 if file not found - The absolute data_offset to the file is stored */ + * -1 if file not found + * The absolute data_offset to the file is stored */ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, const char *name); /* Returns success (0) on finding the file requested by verifying name and type; - -1 if file not found - The absolute data_offset to the file is stored */ + * -1 if file not found + * The absolute data_offset to the file is stored */ int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, const char *name, int type); diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index 5442ddc..05c201b 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -126,29 +126,30 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) void * data; ssize_t v_read; struct cbfs_media default_media; + const void * errorptr = (void *)-1; if (media == CBFS_DEFAULT_MEDIA) { media = &default_media; if (init_default_cbfs_media(media) != 0) { ERROR("Failed to initialize default media.\n"); - return (void *)-1; + return errorptr; } } c = cbfs_find_file_by_type(media, &f, name, CBFS_TYPE_STAGE); if (c < 0) { - ERROR("Stage not loaded\n"); - return (void *)-1; + ERROR("Stage not loaded.\n"); + return errorptr; } value_read = media->read(media, &stage, f.data_offset, sizeof(stage)); /* this is a mess. There is no ntohll. */ /* for now, assume compatible byte order until we solve this. */ if (value_read != sizeof(stage)) - return (void *)-1; + return errorptr; - uint32_t entry; + void * entry; uint32_t final_size; DEBUG("Read Complete @offset = 0x%x and length = %d\n", @@ -166,7 +167,7 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) v_read = media->read(media, (void *) (uintptr_t) stage.load, f.data_offset + sizeof(stage), f.data_len); if (v_read != f.data_len) - return (void *)-1; + return errorptr; final_size = f.data_len; } @@ -174,7 +175,7 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) data = media->map(media, f.data_offset + sizeof(stage), f.data_len); if (data == CBFS_MEDIA_INVALID_MAP_ADDRESS) { ERROR("Map not successful"); - return (void *) -1; + return errorptr; } DEBUG("Map Done\n"); @@ -183,7 +184,7 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) stage.len); if (!final_size) - return (void *) -1; + return errorptr; } /* Stages rely the below clearing so that the bss is initialized. */ @@ -191,8 +192,8 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) stage.memlen - final_size); DEBUG("stage loaded.\n"); - entry = stage.entry; - return (void *) entry; + entry = (void *)(uintptr_t)stage.entry; + return entry; } /* Simple buffer */ diff --git a/src/lib/cbfs_core.c b/src/lib/cbfs_core.c index 164473e..348ff77 100644 --- a/src/lib/cbfs_core.c +++ b/src/lib/cbfs_core.c @@ -191,15 +191,6 @@ int cbfs_find_file(struct cbfs_media *media, struct cbfs_file_handle *f, int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, const char *name, int type) { - struct cbfs_media default_media; - - if (media == CBFS_DEFAULT_MEDIA) { - media = &default_media; - if (init_default_cbfs_media(media) != 0) { - ERROR("Failed to initialize default media/\n"); - return -1; - } - } if (cbfs_find_file(media, f, name) < 0) { ERROR("Failed to find file\n"); @@ -211,10 +202,7 @@ int cbfs_find_file_by_type(struct cbfs_media *media, struct cbfs_file_handle *f, return 0; } else - { - ERROR("File of matching type not found\n"); return -1; - } } @@ -277,8 +265,12 @@ struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) return NULL; } - fileptr = media->map(media, f.data_offset, f.data_len); - return fileptr; + fileptr = media->map(media, f.data_offset - f.file.offset, f.data_len + f.file.offset); + + if (fileptr == CBFS_MEDIA_INVALID_MAP_ADDRESS) + return NULL; + else + return fileptr; } int cbfs_decompress(int algo, void *src, void *dst, int len) diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c index d1ebd84..2fa42c4 100644 --- a/src/lib/loaders/cbfs_payload_loader.c +++ b/src/lib/loaders/cbfs_payload_loader.c @@ -25,11 +25,9 @@ static int cbfs_locate_payload(struct payload *payload) { const int type = CBFS_TYPE_PAYLOAD; - struct cbfs_media default_media, *m; + struct cbfs_media *m; - m = &default_media; - if (init_default_cbfs_media(m) != 0) - return -1; + m = CBFS_DEFAULT_MEDIA; if (cbfs_find_file_by_type(m, &payload->f, payload->name, type) < 0) return -1;

1 0

Patch set updated for coreboot: 3d944c7 superio: Add Nuvoton NCT5577D initial support
by David Hendricks 06 Aug '14

06 Aug '14

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6497 -gerrit commit 3d944c7c472da0c768af6292f63a3bdd0889b578 Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Aug 4 18:01:00 2014 -0700 superio: Add Nuvoton NCT5577D initial support This adds basic support for the Nuvoton NCTT5577D SuperIO chip which is similar to the NCT5104D but with a few different logical devices and only one UART. Change-Id: I1cfc2cb3a4a029d2388308af4b0fbf268889bf09 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- src/superio/nuvoton/Makefile.inc | 1 + src/superio/nuvoton/nct5577d/Makefile.inc | 22 ++++++ src/superio/nuvoton/nct5577d/chip.h | 29 ++++++++ src/superio/nuvoton/nct5577d/early_init.c | 65 ++++++++++++++++++ src/superio/nuvoton/nct5577d/nct5577d.h | 55 +++++++++++++++ src/superio/nuvoton/nct5577d/superio.c | 109 ++++++++++++++++++++++++++++++ 6 files changed, 281 insertions(+) diff --git a/src/superio/nuvoton/Makefile.inc b/src/superio/nuvoton/Makefile.inc index 1ce6963..bd5b96f 100644 --- a/src/superio/nuvoton/Makefile.inc +++ b/src/superio/nuvoton/Makefile.inc @@ -22,3 +22,4 @@ romstage-$(CONFIG_SUPERIO_NUVOTON_COMMON_ROMSTAGE) += common/early_serial.c subdirs-$(CONFIG_SUPERIO_NUVOTON_WPCM450) += wpcm450 subdirs-$(CONFIG_SUPERIO_NUVOTON_NCT5104D) += nct5104d +subdirs-$(CONFIG_SUPERIO_NUVOTON_NCT5577D) += nct5577d diff --git a/src/superio/nuvoton/nct5577d/Makefile.inc b/src/superio/nuvoton/nct5577d/Makefile.inc new file mode 100644 index 0000000..b9fe0e7 --- /dev/null +++ b/src/superio/nuvoton/nct5577d/Makefile.inc @@ -0,0 +1,22 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2014 Google Inc. +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation; either version 2 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program; if not, write to the Free Software +## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +## + +romstage-$(CONFIG_SUPERIO_NUVOTON_NCT5577D) += early_init.c +ramstage-$(CONFIG_SUPERIO_NUVOTON_NCT5577D) += superio.c diff --git a/src/superio/nuvoton/nct5577d/chip.h b/src/superio/nuvoton/nct5577d/chip.h new file mode 100644 index 0000000..ef0f0ca --- /dev/null +++ b/src/superio/nuvoton/nct5577d/chip.h @@ -0,0 +1,29 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Sage Electronic Engineering, LLC + * Copyright (C) 2014 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef SUPERIO_NUVOTON_NCT5577D_CHIP_H +#define SUPERIO_NUVOTON_NCT5577D_CHIP_H + +struct superio_nuvoton_nct5577d_config { + u8 irq_trigger_type; +}; + +#endif diff --git a/src/superio/nuvoton/nct5577d/early_init.c b/src/superio/nuvoton/nct5577d/early_init.c new file mode 100644 index 0000000..35d0211 --- /dev/null +++ b/src/superio/nuvoton/nct5577d/early_init.c @@ -0,0 +1,65 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Advanced Micro Devices, Inc. + * Copyright (C) 2014 Edward O'Callaghan <eocallaghan(a)alterapraxis.com> + * Copyright (C) 2014 Felix Held <felix-coreboot(a)felixheld.de> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <arch/io.h> +#include <device/pnp.h> +#include <stdint.h> +#include "nct5577d.h" + +#define NUVOTON_ENTRY_KEY 0x87 +#define NUVOTON_EXIT_KEY 0xAA + +/* Enable configuration: pass entry key '0x87' into index port dev + * two times. */ +static void pnp_enter_conf_state(device_t dev) +{ + u16 port = dev >> 8; + outb(NUVOTON_ENTRY_KEY, port); + outb(NUVOTON_ENTRY_KEY, port); +} + +/* Disable configuration: pass exit key '0xAA' into index port dev. */ +static void pnp_exit_conf_state(device_t dev) +{ + u16 port = dev >> 8; + outb(NUVOTON_EXIT_KEY, port); +} + +/* NCT5577D has only UART A */ +void nct5577d_enable_uarta(device_t dev, u16 iobase) +{ + u8 tmp; + + pnp_enter_conf_state(dev); + pnp_set_enable(dev, 0); + + /* Select COM A function for Pins 13-20 */ + tmp = pnp_read_config(dev, GLOBAL_OPTION_CR28); + tmp &= ~CR28_PIN13_20_CFG; + pnp_write_config(dev, GLOBAL_OPTION_CR28, tmp); + + pnp_set_logical_device(NCT5577D_SP1); + /* default iobase is 0x03f8 */ + //pnp_set_iobase(dev, PNP_IDX_IO0, iobase); + pnp_set_enable(dev, 1); + pnp_exit_conf_state(dev); +} diff --git a/src/superio/nuvoton/nct5577d/nct5577d.h b/src/superio/nuvoton/nct5577d/nct5577d.h new file mode 100644 index 0000000..9f53b08 --- /dev/null +++ b/src/superio/nuvoton/nct5577d/nct5577d.h @@ -0,0 +1,55 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Advanced Micro Devices, Inc. + * Copyright (C) 2014 Sage Electronic Engineering, LLC + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef SUPERIO_NUVOTON_NCT5577D_H +#define SUPERIO_NUVOTON_NCT5577D_H + +#include <arch/io.h> + +/* SIO global configuration */ +#define IRQ_TYPE_SEL_CR10 0x10 /* UARTA, KBC, Mouse, CIR */ +#define IRQ_TYPE_SEL_CR11 0x11 /* HM, WDTO, SMI */ + +#define GLOBAL_OPTION_CR26 0x26 +#define CR26_LOCK_REG (1 << 4) /* enable access CR10/CR11 */ +#define CR26_UARTA_LEGACY_IRQ (1 << 1) /* toggle UARTA legacy IRQ */ + +#define GLOBAL_OPTION_CR28 0x28 +#define CR28_PIN13_20_CFG (1 << 7) /* 0=COM A, 1=GPIO8 (default) */ + +/* Logical Device Numbers (LDN). */ +#define NCT5577D_SP1 0x02 /* UARTA */ +#define NCT5577D_IR 0x03 /* IR */ +#define NCT5577D_KBC 0x05 /* Keyboard Controller */ +#define NCT5577D_CIR 0x06 /* CIR */ +#define NCT5577D_GPIO7_8_9 0x07 /* GPIO7, 8, and 9 control */ +#define NCT5577D_WDT1_GPIOA 0x08 /* WDT1 and GPIOA control */ +#define NCT5577D_GPIO2_3_4_5_7 0x09 /* GPIO2, 3, 4, 5, and 7 control */ +#define NCT5577D_ACPI 0x0a /* ACPI */ +#define NCT5577D_HWM_FPLED 0x0b /* Hardware monitor, Front Panel LED */ +#define NCT5577D_CIR_WAKEUP 0x0e /* CIR wake-up */ +#define NCT5577D_GPIO_PP_OD 0x0f /* GPIO Push-Pull or Open-Drain */ +#define NCT5577D_DEEP_SLEEP 0x16 /* Deep sleep */ +#define NCT5577D_GPIOA 0x17 /* GPIOA config */ + +void nct5577d_enable_uart(device_t dev); + +#endif /* SUPERIO_NUVOTON_NCT5577D_H */ diff --git a/src/superio/nuvoton/nct5577d/superio.c b/src/superio/nuvoton/nct5577d/superio.c new file mode 100644 index 0000000..0d08056 --- /dev/null +++ b/src/superio/nuvoton/nct5577d/superio.c @@ -0,0 +1,109 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2011 Advanced Micro Devices, Inc. + * Copyright (C) 2014 Google Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include <arch/io.h> +#include <device/pnp.h> +#include <superio/conf_mode.h> +#include <stdlib.h> +#include "nct5577d.h" +#include "chip.h" + +static void config_irq_trigger(device_t dev, u8 reg, u8 bit) +{ + struct superio_nuvoton_nct5577d_config *conf = dev->chip_info; + u8 val; + + val = pnp_read_config(dev, reg); + /* 0 for edge-triggered, 1 for level-triggered */ + if (conf->config_irq_trigger_type) + val |= (1 << bit); + else + val &= ~(1 << bit); + pnp_write_config(dev, reg, val); +} + +static void nct5577d_init(device_t dev) +{ + u8 reg26; + + if (!dev->enabled) + return; + + pnp_enter_conf_mode(dev); + + /* CR26 bit 4 must be set before accessing CR10, CR11, CR13, or CR14 */ + reg26 = pnp_read_config(dev, GLOBAL_OPTION_CR26); + reg26 |= CR26_LOCK_REG; + pnp_write_config(dev, GLOBAL_OPTION_CR26, reg26); + + switch(dev->path.pnp.device) { + /* SP1 (UARTA) IRQ type selection */ + case NCT5577D_SP1: + config_irq_trigger(IRQ_TYPE_SEL_CR10, 5); + break; + case NCT5577D_KBC: + config_irq_trigger(IRQ_TYPE_SEL_CR10, 3); + break; + case NCT5577D_CIR: + config_irq_trigger(IRQ_TYPE_SEL_CR10, 1); + break; + case NCT5577D_HWM_FPLED: + config_irq_trigger(IRQ_TYPE_SEL_CR11, 7); + break; + case NCT5577D_CIR_WAKEUP: + config_irq_trigger(IRQ_TYPE_SEL_CR10, 0); + break; + default: + break; + } + + /* Clear access control register */ + reg26 = pnp_read_config(dev, GLOBAL_OPTION_CR26); + reg26 &= ~CR26_LOCK_REG; + pnp_write_config(dev, GLOBAL_OPTION_CR26, reg26); + pnp_exit_conf_mode(dev); +} + +static struct device_operations ops = { + .read_resources = pnp_read_resources, + .set_resources = pnp_set_resources, + .enable_resources = pnp_enable_resources, + .enable = pnp_alt_enable, + .init = nct5577d_init, + .ops_pnp_mode = &pnp_conf_mode_8787_aa, +}; + +static struct pnp_info pnp_dev_info[] = { + { &ops, NCT5577D_SP1 }, + { &ops, NCT5577D_KBC }, + { &ops, NCT5577D_ACPI }, + { &ops, NCT5577D_HWM_FPLED }, +}; + +static void enable_dev(struct device *dev) +{ + pnp_enable_devices(dev, &ops, ARRAY_SIZE(pnp_dev_info), pnp_dev_info); +} + +struct chip_operations superio_nuvoton_nct5577d_ops = { + CHIP_NAME("NUVOTON NCT5577D Super I/O") + .enable_dev = enable_dev, +};

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2014