From 24e37a885269bdec9b27babf1da0bba3692d55c0 Mon Sep 17 00:00:00 2001

From: Vladimir Serbinenko <phcoder@gmail.com>

Date: Mon, 8 May 2017 20:53:28 +0200

Subject: [PATCH 019/198] arm-coreboot: Start new port.

---

 configure.ac                           |   2 +

 gentpl.py                              |   8 ++-

 grub-core/Makefile.am                  |  10 +++

 grub-core/Makefile.core.def            |  18 ++++-

 grub-core/kern/arm/coreboot/cbtable.c  |  40 +++++++++++

 grub-core/kern/arm/coreboot/coreboot.S |  44 ++++++++++++

 grub-core/kern/arm/coreboot/init.c     | 127 +++++++++++++++++++++++++++++++++

 grub-core/kern/arm/coreboot/timer.c    |  65 +++++++++++++++++

 grub-core/kern/arm/startup.S           |   4 ++

 grub-core/kern/coreboot/cbtable.c      |   2 +

 grub-core/lib/dummy/reboot.c           |  32 +++++++++

 grub-core/loader/arm/linux.c           |   3 +

 include/grub/arm/coreboot/console.h    |  29 ++++++++

 include/grub/arm/coreboot/kernel.h     |  44 ++++++++++++

 include/grub/offsets.h                 |   6 ++

 util/grub-mkimagexx.c                  |  19 +++--

 util/mkimage.c                         |  41 ++++++++++-

 17 files changed, 482 insertions(+), 12 deletions(-)

 create mode 100644 grub-core/kern/arm/coreboot/cbtable.c

 create mode 100644 grub-core/kern/arm/coreboot/coreboot.S

 create mode 100644 grub-core/kern/arm/coreboot/init.c

 create mode 100644 grub-core/kern/arm/coreboot/timer.c

 create mode 100644 grub-core/lib/dummy/reboot.c

 create mode 100644 include/grub/arm/coreboot/console.h

 create mode 100644 include/grub/arm/coreboot/kernel.h

diff --git a/configure.ac b/configure.ac

index ee2c86537..571f7a0b5 100644

--- a/configure.ac

+++ b/configure.ac

@@ -167,6 +167,7 @@ case "$target_cpu"-"$platform" in

   mipsel-fuloong) platform=loongson ;;

   mipsel-loongson) ;;

   arm-uboot) ;;

+  arm-coreboot) ;;

   arm-efi) ;;

   arm64-efi) ;;

   *-emu) ;;

@@ -1918,6 +1919,7 @@ AM_CONDITIONAL([COND_mipsel], [test x$target_cpu = xmipsel])

 AM_CONDITIONAL([COND_mipseb], [test x$target_cpu = xmips])

 AM_CONDITIONAL([COND_arm], [test x$target_cpu = xarm ])

 AM_CONDITIONAL([COND_arm_uboot], [test x$target_cpu = xarm -a x$platform = xuboot])

+AM_CONDITIONAL([COND_arm_coreboot], [test x$target_cpu = xarm -a x$platform = xcoreboot])

 AM_CONDITIONAL([COND_arm_efi], [test x$target_cpu = xarm -a x$platform = xefi])

 AM_CONDITIONAL([COND_arm64], [test x$target_cpu = xarm64 ])

 AM_CONDITIONAL([COND_arm64_efi], [test x$target_cpu = xarm64 -a x$platform = xefi])

diff --git a/gentpl.py b/gentpl.py

index f08bcc404..ed268178b 100644

--- a/gentpl.py

+++ b/gentpl.py

@@ -31,7 +31,8 @@ GRUB_PLATFORMS = [ "emu", "i386_pc", "i386_efi", "i386_qemu", "i386_coreboot",

                    "i386_xen", "x86_64_xen",

                    "mips_loongson", "sparc64_ieee1275",

                    "powerpc_ieee1275", "mips_arc", "ia64_efi",

-                   "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi" ]

+                   "mips_qemu_mips", "arm_uboot", "arm_efi", "arm64_efi",

+                   "arm_coreboot"]

 GROUPS = {}

@@ -44,7 +45,7 @@ GROUPS["x86"]      = GROUPS["i386"] + GROUPS["x86_64"]

 GROUPS["mips"]     = [ "mips_loongson", "mips_qemu_mips", "mips_arc" ]

 GROUPS["sparc64"]  = [ "sparc64_ieee1275" ]

 GROUPS["powerpc"]  = [ "powerpc_ieee1275" ]

-GROUPS["arm"]      = [ "arm_uboot", "arm_efi" ]

+GROUPS["arm"]      = [ "arm_uboot", "arm_efi", "arm_coreboot" ]

 GROUPS["arm64"]    = [ "arm64_efi" ]

 # Groups based on firmware

@@ -52,6 +53,7 @@ GROUPS["efi"]  = [ "i386_efi", "x86_64_efi", "ia64_efi", "arm_efi", "arm64_efi"

 GROUPS["ieee1275"]   = [ "i386_ieee1275", "sparc64_ieee1275", "powerpc_ieee1275" ]

 GROUPS["uboot"] = [ "arm_uboot" ]

 GROUPS["xen"]  = [ "i386_xen", "x86_64_xen" ]

+GROUPS["coreboot"]  = [ "i386_coreboot", "arm_coreboot" ]

 # emu is a special case so many core functionality isn't needed on this platform

 GROUPS["noemu"]   = GRUB_PLATFORMS[:]; GROUPS["noemu"].remove("emu")

@@ -64,7 +66,7 @@ GROUPS["pci"]      = GROUPS["x86"] + ["mips_loongson"]

 GROUPS["usb"]      = GROUPS["pci"]

 # If gfxterm is main output console integrate it into kernel

-GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot" ]

+GROUPS["videoinkernel"] = ["mips_loongson", "i386_coreboot", "arm_coreboot" ]

 GROUPS["videomodules"]   = GRUB_PLATFORMS[:];

 for i in GROUPS["videoinkernel"]: GROUPS["videomodules"].remove(i)

diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am

index 781d0ffbf..bec058554 100644

--- a/grub-core/Makefile.am

+++ b/grub-core/Makefile.am

@@ -239,6 +239,16 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/lib/arg.h

 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h

 endif

+if COND_arm_coreboot

+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/system.h

+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video.h

+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/video_fb.h

+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/gfxterm.h

+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/font.h

+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/bufio.h

+KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/coreboot/kernel.h

+endif

+

 if COND_arm_efi

 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/arm/efi/loader.h

 KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/efi/efi.h

diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def

index 6540dc951..411dca46b 100644

--- a/grub-core/Makefile.core.def

+++ b/grub-core/Makefile.core.def

@@ -92,6 +92,8 @@ kernel = {

   emu_cppflags = '$(CPPFLAGS_GNULIB)';

   arm_uboot_ldflags       = '-Wl,-r,-d';

   arm_uboot_stripflags    = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';

+  arm_coreboot_ldflags       = '-Wl,-r,-d';

+  arm_coreboot_stripflags    = '--strip-unneeded -K start -R .note -R .comment -R .note.gnu.gold-version';

   i386_pc_startup = kern/i386/pc/startup.S;

   i386_efi_startup = kern/i386/efi/startup.S;

@@ -106,6 +108,7 @@ kernel = {

   sparc64_ieee1275_startup = kern/sparc64/ieee1275/crt0.S;

   powerpc_ieee1275_startup = kern/powerpc/ieee1275/startup.S;

   arm_uboot_startup = kern/arm/startup.S;

+  arm_coreboot_startup = kern/arm/startup.S;

   arm_efi_startup = kern/arm/efi/startup.S;

   arm64_efi_startup = kern/arm64/efi/startup.S;

@@ -152,6 +155,10 @@ kernel = {

   arm_uboot = kern/arm/uboot/init.c;

   arm_uboot = kern/arm/uboot/uboot.S;

+  arm_coreboot = kern/arm/coreboot/init.c;

+  arm_coreboot = kern/arm/coreboot/timer.c;

+  arm_coreboot = kern/arm/coreboot/coreboot.S;

+

   terminfoinkernel = term/terminfo.c;

   terminfoinkernel = term/tparm.c;

   terminfoinkernel = commands/extcmd.c;

@@ -166,7 +173,7 @@ kernel = {

   i386_multiboot = kern/i386/coreboot/init.c;

   i386_qemu = kern/i386/qemu/init.c;

   i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;

-  i386_coreboot = video/coreboot/cbfb.c;

+  coreboot = video/coreboot/cbfb.c;

   efi = disk/efi/efidisk.c;

   efi = kern/efi/efi.c;

@@ -227,9 +234,10 @@ kernel = {

   i386_qemu = kern/vga_init.c;

   i386_qemu = kern/i386/qemu/mmap.c;

-  i386_coreboot = kern/coreboot/mmap.c;

+  coreboot = kern/coreboot/mmap.c;

   i386_coreboot = kern/i386/coreboot/cbtable.c;

-  i386_coreboot = kern/coreboot/cbtable.c;

+  coreboot = kern/coreboot/cbtable.c;

+  arm_coreboot = kern/arm/coreboot/cbtable.c;

   i386_multiboot = kern/i386/multiboot_mmap.c;

@@ -758,6 +766,7 @@ module = {

   enable = arm_efi;

   enable = arm64_efi;

   enable = arm_uboot;

+  enable = arm_coreboot;

 };

 module = {

@@ -842,6 +851,7 @@ module = {

   ieee1275 = lib/ieee1275/halt.c;

   emu = lib/emu/halt.c;

   uboot = lib/dummy/halt.c;

+  arm_coreboot = lib/dummy/halt.c;

 };

 module = {

@@ -859,6 +869,7 @@ module = {

   mips_qemu_mips = lib/mips/qemu_mips/reboot.c;

   xen = lib/xen/reboot.c;

   uboot = lib/uboot/reboot.c;

+  arm_coreboot = lib/dummy/reboot.c;

   common = commands/reboot.c;

 };

@@ -1553,6 +1564,7 @@ module = {

   cmos = lib/cmos_datetime.c;

   efi = lib/efi/datetime.c;

   uboot = lib/dummy/datetime.c;

+  arm_coreboot = lib/dummy/datetime.c;

   sparc64_ieee1275 = lib/ieee1275/datetime.c;

   powerpc_ieee1275 = lib/ieee1275/datetime.c;

   sparc64_ieee1275 = lib/ieee1275/cmos.c;

diff --git a/grub-core/kern/arm/coreboot/cbtable.c b/grub-core/kern/arm/coreboot/cbtable.c

new file mode 100644

index 000000000..8a655bb5c

--- /dev/null

+++ b/grub-core/kern/arm/coreboot/cbtable.c

@@ -0,0 +1,40 @@

+/*

+ *  GRUB  --  GRand Unified Bootloader

+ *  Copyright (C) 2007,2008,2013  Free Software Foundation, Inc.

+ *

+ *  GRUB 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 3 of the License, or

+ *  (at your option) any later version.

+ *

+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include <grub/coreboot/lbio.h>

+#include <grub/types.h>

+#include <grub/err.h>

+#include <grub/misc.h>

+#include <grub/dl.h>

+#include <grub/arm/startup.h>

+

+GRUB_MOD_LICENSE ("GPLv3+");

+

+#pragma GCC diagnostic ignored "-Wcast-align"

+

+grub_linuxbios_table_header_t

+grub_linuxbios_get_tables (void)

+{

+  grub_linuxbios_table_header_t table_header

+    = (grub_linuxbios_table_header_t) grub_arm_saved_registers.r[0];

+

+  if (!grub_linuxbios_check_signature (table_header))

+    return 0;

+

+  return table_header;

+}

diff --git a/grub-core/kern/arm/coreboot/coreboot.S b/grub-core/kern/arm/coreboot/coreboot.S

new file mode 100644

index 000000000..a1104526c

--- /dev/null

+++ b/grub-core/kern/arm/coreboot/coreboot.S

@@ -0,0 +1,44 @@

+/*

+ *  GRUB  --  GRand Unified Bootloader

+ *  Copyright (C) 2016  Free Software Foundation, Inc.

+ *

+ *  GRUB 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 3 of the License, or

+ *  (at your option) any later version.

+ *

+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include <grub/symbol.h>

+

+	.file	"coreboot.S"

+	.text

+	.syntax	unified

+#if !defined (__thumb2__)

+	.arch	armv7a

+	.arm

+#else

+	.arch	armv7

+	.thumb

+#endif

+

+FUNCTION(grub_arm_pfr1)

+	mrc p15, 0, r0, c0, c1, 1

+	bx	lr

+

+FUNCTION(grub_armv7_get_timer_value)

+	isb

+	mrrc p15, 1, r0, r1, c14

+	bx	lr

+

+FUNCTION(grub_armv7_get_timer_frequency)

+	mrc p15, 0, r0, c14, c0, 0

+	bx	lr

+

diff --git a/grub-core/kern/arm/coreboot/init.c b/grub-core/kern/arm/coreboot/init.c

new file mode 100644

index 000000000..51ecaceb0

--- /dev/null

+++ b/grub-core/kern/arm/coreboot/init.c

@@ -0,0 +1,127 @@

+/*

+ *  GRUB  --  GRand Unified Bootloader

+ *  Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2013  Free Software Foundation, Inc.

+ *

+ *  GRUB 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 3 of the License, or

+ *  (at your option) any later version.

+ *

+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include <grub/kernel.h>

+#include <grub/mm.h>

+#include <grub/memory.h>

+#include <grub/machine/console.h>

+#include <grub/machine/kernel.h>

+#include <grub/offsets.h>

+#include <grub/types.h>

+#include <grub/err.h>

+#include <grub/dl.h>

+#include <grub/misc.h>

+#include <grub/loader.h>

+#include <grub/env.h>

+#include <grub/cache.h>

+#include <grub/time.h>

+#include <grub/symbol.h>

+#include <grub/video.h>

+#include <grub/coreboot/lbio.h>

+

+extern grub_uint8_t _start[];

+extern grub_uint8_t _end[];

+extern grub_uint8_t _edata[];

+grub_addr_t start_of_ram = ~(grub_addr_t)0;

+

+void  __attribute__ ((noreturn))

+grub_exit (void)

+{

+  /* We can't use grub_fatal() in this function.  This would create an infinite

+     loop, since grub_fatal() calls grub_abort() which in turn calls grub_exit().  */

+  while (1)

+    grub_cpu_idle ();

+}

+

+static grub_uint64_t modend;

+static int have_memory = 0;

+

+/* Helper for grub_machine_init.  */

+static int

+heap_init (grub_uint64_t addr, grub_uint64_t size, grub_memory_type_t type,

+	   void *data __attribute__ ((unused)))

+{

+  grub_uint64_t begin = addr, end = addr + size;

+

+#if GRUB_CPU_SIZEOF_VOID_P == 4

+  /* Restrict ourselves to 32-bit memory space.  */

+  if (begin > GRUB_ULONG_MAX)

+    return 0;

+  if (end > GRUB_ULONG_MAX)

+    end = GRUB_ULONG_MAX;

+#endif

+

+  if (start_of_ram > begin)

+    start_of_ram = begin;

+

+  if (type != GRUB_MEMORY_AVAILABLE)

+    return 0;

+

+  if (modend && begin < modend)

+    {

+      if (begin < (grub_addr_t)_start)

+	{

+	  grub_mm_init_region ((void *) (grub_addr_t) begin, (grub_size_t) ((grub_addr_t)_start - begin));

+	  have_memory = 1;

+	}

+      begin = modend;

+    }

+

+  /* Avoid DMA problems.  */

+  if (end >= 0xfe000000)

+    end = 0xfe000000;

+

+  if (end <= begin)

+    return 0;

+

+  grub_mm_init_region ((void *) (grub_addr_t) begin, (grub_size_t) (end - begin));

+

+  have_memory = 1;

+

+  return 0;

+}

+

+void

+grub_machine_init (void)

+{

+  modend = grub_modules_get_end ();

+

+  grub_video_coreboot_fb_early_init ();

+

+  grub_machine_mmap_iterate (heap_init, NULL);

+  if (!have_memory)

+    grub_fatal ("No memory found");

+

+  grub_video_coreboot_fb_late_init ();

+

+  grub_font_init ();

+  grub_gfxterm_init ();

+

+  grub_machine_timer_init ();

+}

+

+void

+grub_machine_get_bootlocation (char **device __attribute__ ((unused)),

+			       char **path __attribute__ ((unused)))

+{

+}

+

+void

+grub_machine_fini (int flags __attribute__ ((unused)))

+{

+}

diff --git a/grub-core/kern/arm/coreboot/timer.c b/grub-core/kern/arm/coreboot/timer.c

new file mode 100644

index 000000000..ebefb99d5

--- /dev/null

+++ b/grub-core/kern/arm/coreboot/timer.c

@@ -0,0 +1,65 @@

+/*

+ *  GRUB  --  GRand Unified Bootloader

+ *  Copyright (C) 2016  Free Software Foundation, Inc.

+ *

+ *  GRUB 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 3 of the License, or

+ *  (at your option) any later version.

+ *

+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include <grub/mm.h>

+#include <grub/machine/kernel.h>

+#include <grub/types.h>

+#include <grub/err.h>

+#include <grub/time.h>

+#include <grub/misc.h>

+

+grub_uint64_t

+grub_armv7_get_timer_value(void);

+

+grub_uint32_t

+grub_armv7_get_timer_frequency(void);

+

+grub_uint32_t

+grub_arm_pfr1(void);

+

+static int have_timer = 0;

+static grub_uint32_t timer_frequency_in_khz;

+

+static grub_uint64_t

+generic_get_time_ms (void)

+{

+  return grub_divmod64 (grub_armv7_get_timer_value(), timer_frequency_in_khz, 0);

+}

+

+static int

+try_generic_timer (void)

+{

+  if (((grub_arm_pfr1 () >> 16) & 0xf) != 1)

+    return 0;

+  grub_printf ("freq = %x\n", grub_armv7_get_timer_frequency());

+  timer_frequency_in_khz = 0x016e3600 / 1000; //grub_armv7_get_timer_frequency() / 1000;

+  if (timer_frequency_in_khz == 0)

+    return 0;

+  grub_install_get_time_ms (generic_get_time_ms);

+  have_timer = 1;

+  return 1;

+}

+

+void

+grub_machine_timer_init (void)

+{

+  if (!have_timer)

+    try_generic_timer ();

+  if (!have_timer)

+    grub_fatal ("No timer found");

+}

diff --git a/grub-core/kern/arm/startup.S b/grub-core/kern/arm/startup.S

index 640837cba..3946fe8e1 100644

--- a/grub-core/kern/arm/startup.S

+++ b/grub-core/kern/arm/startup.S

@@ -24,6 +24,7 @@

  * GRUB is called from U-Boot as a Linux Kernel type image, which

  * means among other things that it always enters in ARM state.

  *

+ * coreboot starts in ARM mode as well.

  *

  * Overview of GRUB image layout:

  *

@@ -127,6 +128,8 @@ reloc_done:

 	str     r1, EXT_C(grub_modbase)

+	/* Coreboot already places modules at right place.  */

+#ifndef GRUB_MACHINE_COREBOOT

 	add	r1, r1, r2

 	add	r0, r0, r2

 	sub     r1, r1, #4

@@ -136,6 +139,7 @@ reloc_done:

 	str	r3, [r1], #-4			@ *dst-- = r3 

 	subs	r2, #4				@ remaining -= 4

 	bne	1b				@ while remaining != 0

+#endif

 	@ Since we _are_ the C run-time, we need to manually zero the BSS

 	@ region before continuing

diff --git a/grub-core/kern/coreboot/cbtable.c b/grub-core/kern/coreboot/cbtable.c

index 996d3f407..aec63dbd1 100644

--- a/grub-core/kern/coreboot/cbtable.c

+++ b/grub-core/kern/coreboot/cbtable.c

@@ -23,6 +23,8 @@

 #include <grub/misc.h>

 #include <grub/dl.h>

+#pragma GCC diagnostic ignored "-Wcast-align"

+

 /* Helper for grub_linuxbios_table_iterate.  */

 int

 grub_linuxbios_check_signature (grub_linuxbios_table_header_t tbl_header)

diff --git a/grub-core/lib/dummy/reboot.c b/grub-core/lib/dummy/reboot.c

new file mode 100644

index 000000000..b8cbed8f8

--- /dev/null

+++ b/grub-core/lib/dummy/reboot.c

@@ -0,0 +1,32 @@

+/*

+ *  GRUB  --  GRand Unified Bootloader

+ *  Copyright (C) 2013  Free Software Foundation, Inc.

+ *

+ *  GRUB 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 3 of the License, or

+ *  (at your option) any later version.

+ *

+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#include <grub/misc.h>

+#include <grub/mm.h>

+#include <grub/kernel.h>

+#include <grub/loader.h>

+

+void

+grub_reboot (void)

+{

+  grub_machine_fini (GRUB_LOADER_FLAG_NORETURN);

+

+  /* Just stop here */

+

+  while (1);

+}

diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c

index 5b39f02bb..01374ee78 100644

--- a/grub-core/loader/arm/linux.c

+++ b/grub-core/loader/arm/linux.c

@@ -31,6 +31,8 @@

 GRUB_MOD_LICENSE ("GPLv3+");

+#ifndef GRUB_MACHINE_COREBOOT

+

 static grub_dl_t my_mod;

 static grub_addr_t initrd_start;

@@ -527,3 +529,4 @@ GRUB_MOD_FINI (linux)

   grub_unregister_command (cmd_initrd);

   grub_unregister_command (cmd_devicetree);

 }

+#endif

diff --git a/include/grub/arm/coreboot/console.h b/include/grub/arm/coreboot/console.h

new file mode 100644

index 000000000..13a14b783

--- /dev/null

+++ b/include/grub/arm/coreboot/console.h

@@ -0,0 +1,29 @@

+/*

+ *  GRUB  --  GRand Unified Bootloader

+ *  Copyright (C) 2009  Free Software Foundation, Inc.

+ *

+ *  GRUB 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 3 of the License, or

+ *  (at your option) any later version.

+ *

+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#ifndef GRUB_MACHINE_CONSOLE_HEADER

+#define GRUB_MACHINE_CONSOLE_HEADER	1

+

+void grub_video_coreboot_fb_init (void);

+void grub_video_coreboot_fb_early_init (void);

+void grub_video_coreboot_fb_late_init (void);

+void grub_video_coreboot_fb_fini (void);

+

+extern struct grub_linuxbios_table_framebuffer *grub_video_coreboot_fbtable;

+

+#endif /* ! GRUB_MACHINE_CONSOLE_HEADER */

diff --git a/include/grub/arm/coreboot/kernel.h b/include/grub/arm/coreboot/kernel.h

new file mode 100644

index 000000000..09cd7fe32

--- /dev/null

+++ b/include/grub/arm/coreboot/kernel.h

@@ -0,0 +1,44 @@

+/*

+ *  GRUB  --  GRand Unified Bootloader

+ *  Copyright (C) 2013 Free Software Foundation, Inc.

+ *

+ *  GRUB 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 3 of the License, or

+ *  (at your option) any later version.

+ *

+ *  GRUB 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 GRUB.  If not, see <http://www.gnu.org/licenses/>.

+ */

+

+#ifndef GRUB_KERNEL_MACHINE_HEADER

+#define GRUB_KERNEL_MACHINE_HEADER	1

+

+#ifndef ASM_FILE

+

+#include <grub/symbol.h>

+#include <grub/types.h>

+

+struct grub_fdt_board

+{

+  const char *vendor, *part;

+  const grub_uint8_t *dtb;

+  grub_size_t dtb_size;

+};

+

+extern struct grub_fdt_board grub_fdt_boards[];

+void grub_machine_timer_init (void);

+void grub_pl050_init (void);

+void

+grub_cros_init (void);

+extern grub_addr_t EXPORT_VAR (start_of_ram);

+#endif /* ! ASM_FILE */

+

+#define GRUB_KERNEL_MACHINE_STACK_SIZE GRUB_KERNEL_ARM_STACK_SIZE

+

+#endif /* ! GRUB_KERNEL_MACHINE_HEADER */

diff --git a/include/grub/offsets.h b/include/grub/offsets.h

index c88c86d4d..bf0689fc9 100644

--- a/include/grub/offsets.h

+++ b/include/grub/offsets.h

@@ -122,6 +122,12 @@

 #define GRUB_KERNEL_ARM_UBOOT_MOD_ALIGN 	0x8

 #define GRUB_KERNEL_ARM_UBOOT_TOTAL_MODULE_SIZE	0x4

+#define GRUB_KERNEL_ARM_COREBOOT_MOD_ALIGN 	0x8

+#define GRUB_KERNEL_ARM_COREBOOT_TOTAL_MODULE_SIZE	0x4

+

+#define GRUB_KERNEL_ARM_STACK_SIZE 0x40000

+#define GRUB_KERNEL_ARM_COREBOOT_MOD_GAP (GRUB_KERNEL_ARM_STACK_SIZE + 1024)

+

 /* Minimal gap between _end and the start of the modules.  It's a hack

    for PowerMac to prevent "CLAIM failed" error.  The real fix is to

    rewrite grub-mkimage to generate valid ELF files.  */

diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c

index 3fab93e20..a2bb05439 100644

--- a/util/grub-mkimagexx.c

+++ b/util/grub-mkimagexx.c

@@ -87,7 +87,8 @@ struct fixup_block_list

 static int

 is_relocatable (const struct grub_install_image_target_desc *image_target)

 {

-  return image_target->id == IMAGE_EFI || image_target->id == IMAGE_UBOOT;

+  return image_target->id == IMAGE_EFI || image_target->id == IMAGE_UBOOT

+    || (image_target->id == IMAGE_COREBOOT && image_target->elf_target == EM_ARM);

 }

 #ifdef MKIMAGE_ELF32

@@ -274,7 +275,10 @@ SUFFIX (grub_mkimage_generate_elf) (const struct grub_install_image_target_desc

     {

       grub_uint32_t target_addr_mods;