mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH 72/78] ARM: aarch64: Add support to start kernel and barebox
Date: Fri, 16 Mar 2018 13:53:48 +0100	[thread overview]
Message-ID: <20180316125354.23462-73-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20180316125354.23462-1-s.hauer@pengutronix.de>

aarch64 has its own image format. Add a bootm handler to handle this
format. Also add a barebox handler.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 arch/arm/lib64/armlinux.c | 120 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 98 insertions(+), 22 deletions(-)

diff --git a/arch/arm/lib64/armlinux.c b/arch/arm/lib64/armlinux.c
index 54ce6ca046..238e8b67a4 100644
--- a/arch/arm/lib64/armlinux.c
+++ b/arch/arm/lib64/armlinux.c
@@ -1,51 +1,127 @@
 /*
- * (C) Copyright 2002
- * Sysgo Real-Time Solutions, GmbH <www.elinos.com>
- * Marius Groeger <mgroeger@sysgo.de>
+ * Copyright (C) 2018 Sascha Hauer <s.hauer@pengutronix.de>
  *
- * Copyright (C) 2001  Erik Mouw (J.A.K.Mouw@its.tudelft.nl)
- *
- * 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 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.
  *
  * 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.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
  */
 
 #include <boot.h>
 #include <common.h>
-#include <command.h>
-#include <driver.h>
 #include <environment.h>
 #include <image.h>
-#include <init.h>
 #include <fs.h>
-#include <linux/list.h>
 #include <xfuncs.h>
 #include <malloc.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <memory.h>
 #include <of.h>
-#include <magicvar.h>
-
+#include <init.h>
+#include <bootm.h>
+#include <linux/list.h>
 #include <asm/byteorder.h>
 #include <asm/setup.h>
 #include <asm/barebox-arm.h>
 #include <asm/armlinux.h>
 #include <asm/system.h>
 
-void start_linux(void *adr, int swap, unsigned long initrd_address,
-		 unsigned long initrd_size, void *oftree,
-		 enum arm_security_state bootm_secure_state)
+static int do_bootm_linux(struct image_data *data)
 {
-	void (*kernel)(void *dtb) = adr;
+	void (*fn)(unsigned long dtb, unsigned long x1, unsigned long x2,
+		       unsigned long x3);
+	resource_size_t start, end;
+	unsigned long text_offset, image_size, devicetree, kernel;
+	int ret;
+
+	text_offset = le64_to_cpup(data->os_header + 8);
+	image_size = le64_to_cpup(data->os_header + 16);
+
+	ret = memory_bank_first_find_space(&start, &end);
+	if (ret)
+		goto out;
+
+	kernel = ALIGN(start, SZ_2M) + text_offset;
+
+	ret = bootm_load_os(data, kernel);
+	if (ret)
+		goto out;
+
+	devicetree = ALIGN(kernel + image_size, PAGE_SIZE);
+
+	ret = bootm_load_devicetree(data, devicetree);
+	if (ret)
+		goto out;
+
+	printf("Loaded kernel to 0x%08lx, devicetree at 0x%08lx\n",
+	       kernel, devicetree);
 
 	shutdown_barebox();
 
-	kernel(oftree);
+	fn = (void *)kernel;
+
+	fn(devicetree, 0, 0, 0);
+
+	ret = -EINVAL;
+
+out:
+	return ret;
+}
+
+static struct image_handler aarch64_linux_handler = {
+        .name = "ARM aarch64 Linux image",
+        .bootm = do_bootm_linux,
+        .filetype = filetype_arm64_linux_image,
+};
+
+static int do_bootm_barebox(struct image_data *data)
+{
+	void (*fn)(unsigned long x0, unsigned long x1, unsigned long x2,
+		       unsigned long x3);
+	resource_size_t start, end;
+	unsigned long barebox;
+	int ret;
+
+	ret = memory_bank_first_find_space(&start, &end);
+	if (ret)
+		goto out;
+
+	barebox = start;
+
+	ret = bootm_load_os(data, barebox);
+	if (ret)
+		goto out;
+
+	printf("Loaded barebox image to 0x%08lx\n", barebox);
+
+	shutdown_barebox();
+
+	fn = (void *)barebox;
+
+	fn(0, 0, 0, 0);
+
+	ret = -EINVAL;
+
+out:
+	return ret;
+}
+
+static struct image_handler aarch64_barebox_handler = {
+        .name = "ARM aarch64 barebox image",
+        .bootm = do_bootm_barebox,
+        .filetype = filetype_arm_barebox,
+};
+
+static int aarch64_register_image_handler(void)
+{
+	register_image_handler(&aarch64_linux_handler);
+	register_image_handler(&aarch64_barebox_handler);
+
+	return 0;
 }
+late_initcall(aarch64_register_image_handler);
-- 
2.16.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2018-03-16 12:54 UTC|newest]

Thread overview: 86+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-16 12:52 [PATCH 00/78] ARM aarch64 updates Sascha Hauer
2018-03-16 12:52 ` [PATCH 01/78] ARM: Use obj-pbl- where appropriate Sascha Hauer
2018-03-16 12:52 ` [PATCH 02/78] ARM: Add 64bit compilation alternative Sascha Hauer
2018-03-16 12:52 ` [PATCH 03/78] ARM: return positive offset in get_runtime_offset() Sascha Hauer
2018-03-16 12:52 ` [PATCH 04/78] ARM: mmu: include pgtable header from where it's needed Sascha Hauer
2018-03-16 12:52 ` [PATCH 05/78] ARM: For relocatable image force TEXT_BASE 0x0 Sascha Hauer
2018-03-16 12:52 ` [PATCH 06/78] ARM: scroll past image end without ld_var Sascha Hauer
2018-03-16 12:52 ` [PATCH 07/78] ARM: move away from ld_var Sascha Hauer
2018-03-16 12:52 ` [PATCH 08/78] ARM: remove ld_var support Sascha Hauer
2018-03-16 12:52 ` [PATCH 09/78] ARM: android image: Fix compiler warning on aarch64 Sascha Hauer
2018-03-16 12:52 ` [PATCH 10/78] ARM: bootm: Fix wrong format specifier Sascha Hauer
2018-03-16 12:52 ` [PATCH 11/78] ARM: shutdown: Fix compiler warning Sascha Hauer
2018-03-16 12:52 ` [PATCH 12/78] ARM: aarch64: silence " Sascha Hauer
2018-03-16 12:52 ` [PATCH 13/78] ARM: aarch64: Add dummy naked attribute Sascha Hauer
2018-03-16 12:52 ` [PATCH 14/78] ARM: get_runtime_offset() returns unsigned long Sascha Hauer
2018-03-16 12:52 ` [PATCH 15/78] ARM: aarch64: Add runtime-offset Sascha Hauer
2018-03-16 12:52 ` [PATCH 16/78] ARM: aarch64: implement get_pc() Sascha Hauer
2018-03-16 12:52 ` [PATCH 17/78] ARM: Use generic ffz() Sascha Hauer
2018-03-16 12:52 ` [PATCH 18/78] ARM: bitops: remove unnecessary #ifdef Sascha Hauer
2018-03-16 12:52 ` [PATCH 19/78] ARM: aarch64: Do not use 32bit optimized fls Sascha Hauer
2018-03-16 12:52 ` [PATCH 20/78] ARM: Move mmu_disable to mmu.c Sascha Hauer
2018-03-16 12:52 ` [PATCH 21/78] debug_ll: support 64bit longs Sascha Hauer
2018-03-16 12:52 ` [PATCH 22/78] ARM: aarch64: fix early cache flushing Sascha Hauer
2018-03-16 12:52 ` [PATCH 23/78] ARM: aarch64: cache: Add v8_inv_dcache_range Sascha Hauer
2018-03-16 12:53 ` [PATCH 24/78] ARM: aarch64: cache: no need to ifdef prototypes Sascha Hauer
2018-03-16 12:53 ` [PATCH 25/78] ARM: Add function to return offset to global variables Sascha Hauer
2018-03-16 12:53 ` [PATCH 26/78] ARM: remove function prototypes from the past Sascha Hauer
2018-03-16 12:53 ` [PATCH 27/78] ARM: move linker variable declarations to sections.h Sascha Hauer
2018-03-16 12:53 ` [PATCH 28/78] ARM: relocate_to_current_adr: Use unsigned long for variables Sascha Hauer
2018-03-16 12:53 ` [PATCH 29/78] clocksource: Add armv8 generic timer support Sascha Hauer
2018-03-16 12:53 ` [PATCH 30/78] ARM: aarch64: Add relocation support Sascha Hauer
2018-03-16 21:51   ` Andrey Smirnov
2018-03-19  8:50     ` Sascha Hauer
2018-03-21  5:27       ` Andrey Smirnov
2018-03-21 11:26   ` [PATCH v2 " Sascha Hauer
2018-03-16 12:53 ` [PATCH 31/78] ARM: aarch64: fix pbl linker script for aarch64 Sascha Hauer
2018-03-16 12:53 ` [PATCH 32/78] ARM: aarch64: mmu: Allocate page tables dynamically Sascha Hauer
2018-03-16 12:53 ` [PATCH 33/78] ARM: aarch64: mmu: create_sections() takes size in bytes Sascha Hauer
2018-03-16 12:53 ` [PATCH 34/78] ARM: aarch64: mmu: fix creation of flat mapping Sascha Hauer
2018-03-16 12:53 ` [PATCH 35/78] ARM: aarch64: mmu: remove unused map_io_sections() Sascha Hauer
2018-03-16 12:53 ` [PATCH 36/78] ARM: aarch64: mmu: by default map as device memory Sascha Hauer
2018-03-16 12:53 ` [PATCH 37/78] ARM: aarch64: mmu: Fix mair register setting Sascha Hauer
2018-03-16 12:53 ` [PATCH 38/78] ARM: aarch64: qemu board: remove unnecessary mapping Sascha Hauer
2018-03-16 12:53 ` [PATCH 39/78] ARM: aarch64: mmu: enable mmu in generic code Sascha Hauer
2018-03-16 12:53 ` [PATCH 40/78] ARM: aarch64: mmu: use PTE_* definitions from U-Boot Sascha Hauer
2018-03-16 12:53 ` [PATCH 41/78] ARM: aarch64: mmu: Fix adding additional page table levels Sascha Hauer
2018-03-16 12:53 ` [PATCH 42/78] ARM: aarch64: mmu: Fix PTE_TYPE_* flags Sascha Hauer
2018-03-16 12:53 ` [PATCH 43/78] ARM: aarch64: mmu: Fix TCR setting Sascha Hauer
2018-03-16 12:53 ` [PATCH 44/78] ARM: aarch64: mmu: No need to disable icache Sascha Hauer
2018-03-16 12:53 ` [PATCH 45/78] ARM: aarch64: mmu: drop ttb check when disabling the MMU Sascha Hauer
2018-03-16 12:53 ` [PATCH 46/78] ARM: aarch64: mmu: Fix " Sascha Hauer
2018-03-16 12:53 ` [PATCH 47/78] ARM: Make some variables 64bit aware Sascha Hauer
2018-03-16 12:53 ` [PATCH 48/78] dma: Use dma_addr_t as type for DMA addresses Sascha Hauer
2018-03-16 12:53 ` [PATCH 49/78] dma: Add prototypes for dma mapping functions Sascha Hauer
2018-03-16 12:53 ` [PATCH 50/78] ARM: implement " Sascha Hauer
2018-03-16 12:53 ` [PATCH 51/78] ARM: aarch64: implement dma operations Sascha Hauer
2018-03-16 12:53 ` [PATCH 52/78] ARM: aarch64: compile with strict alignment Sascha Hauer
2018-03-16 12:53 ` [PATCH 53/78] ARM: aarch64: move aarch64 exception support to separate file Sascha Hauer
2018-03-16 12:53 ` [PATCH 54/78] ARM: aarch64: fix exception level mixup Sascha Hauer
2018-03-16 12:53 ` [PATCH 55/78] ARM: aarch64: Setup exception vectors in initcall Sascha Hauer
2018-03-16 12:53 ` [PATCH 56/78] ARM: aarch64: lowlevel: Use switch_el Sascha Hauer
2018-03-16 12:53 ` [PATCH 57/78] ARM: aarch64: remove dead code in linker script Sascha Hauer
2018-03-16 12:53 ` [PATCH 58/78] ARM: aarch64: hide some config options Sascha Hauer
2018-03-16 12:53 ` [PATCH 59/78] ARM: aarch64: implement show_regs() Sascha Hauer
2018-03-16 12:53 ` [PATCH 60/78] ARM: aarch64: implement stacktraces Sascha Hauer
2018-03-16 12:53 ` [PATCH 61/78] ARM: aarch64: mmu: Make zero page faulting Sascha Hauer
2018-03-21  4:53   ` Andrey Smirnov
2018-04-09  6:55     ` Sascha Hauer
2018-03-16 12:53 ` [PATCH 62/78] ARM: aarch64: Allow to leave exceptions Sascha Hauer
2018-03-16 12:53 ` [PATCH 63/78] ARM: aarch64: Add esr strings Sascha Hauer
2018-03-16 12:53 ` [PATCH 64/78] ARM: aarch64: print more information on sync exception Sascha Hauer
2018-03-16 12:53 ` [PATCH 65/78] ARM: aarch64: implement ignoring data aborts Sascha Hauer
2018-03-16 12:53 ` [PATCH 66/78] dt-bindings: Drop unused files Sascha Hauer
2018-03-16 12:53 ` [PATCH 67/78] ARM: aarch64: Add barebox head support Sascha Hauer
2018-03-16 12:53 ` [PATCH 68/78] filetype: Detect ARM aarch64 Linux images Sascha Hauer
2018-03-16 12:53 ` [PATCH 69/78] common: Add functions to find free RAM Sascha Hauer
2018-03-16 12:53 ` [PATCH 70/78] bootm: provide handlers the start of the OS image Sascha Hauer
2018-03-16 12:53 ` [PATCH 71/78] ARM: aarch64: disable 32bit boot commands Sascha Hauer
2018-03-16 12:53 ` Sascha Hauer [this message]
2018-03-16 12:53 ` [PATCH 73/78] ARM: cache-armv4: Fix wrong section Sascha Hauer
2018-03-16 12:53 ` [PATCH 74/78] ARM: build: Remove duplicate file compilation Sascha Hauer
2018-03-16 12:53 ` [PATCH 75/78] ARM: Create own cache.c file for aarch64 Sascha Hauer
2018-03-16 12:53 ` [PATCH 76/78] ARM: create separate mmu_64.h file Sascha Hauer
2018-03-16 12:53 ` [PATCH 77/78] ARM: change mmu_early_enable() prototype Sascha Hauer
2018-03-16 12:53 ` [PATCH 78/78] ARM: aarch64: Make early MMU support work Sascha Hauer
2018-03-21  5:35 ` [PATCH 00/78] ARM aarch64 updates Andrey Smirnov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180316125354.23462-73-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox