All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christopher Harvey <charvey@matrox.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH V5 3/4] ARM: Warn when the machine ID isn't set.
Date: Tue, 30 Aug 2011 16:49:35 -0400	[thread overview]
Message-ID: <20110830204935.GA7377@harvey-pc.matrox.com> (raw)
In-Reply-To: <20110718173344.GA3663@harvey-pc.matrox.com>

Linux cannot boot without it.

Signed-off-by: Christopher Harvey <charvey@matrox.com>
---

V2:
Used a #define instead of a constant.
Used a printf instead of a debug.

---

V3:
Moved gd->bd->bi_arch_number = BI_ARCH_NUMBER_INVALID; before the 
  init_sequence loop, so it doesn't overwrite existing values.
Removed unneeded braces. 

Reminder, in V2 of this series there are 3 uncommited patches that
  have no comments.

---

V4:
Fixed mixed tabs and spaces.
Message prints in both debug and release mode. 

---

V5:

Rebase to bd061a5214e60c9d1bb24393933323bd1a2dae19

 arch/arm/include/asm/u-boot.h |    2 ++
 arch/arm/lib/board.c          |    3 +++
 arch/arm/lib/bootm.c          |    3 +++
 3 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/arch/arm/include/asm/u-boot.h b/arch/arm/include/asm/u-boot.h
index ed33327..81735de 100644
--- a/arch/arm/include/asm/u-boot.h
+++ b/arch/arm/include/asm/u-boot.h
@@ -48,4 +48,6 @@ typedef struct bd_info {
     }			bi_dram[CONFIG_NR_DRAM_BANKS];
 } bd_t;
 
+#define BI_ARCH_NUMBER_INVALID  0xffffffff
+
 #endif	/* _U_BOOT_H_ */
diff --git a/arch/arm/lib/board.c b/arch/arm/lib/board.c
index 14a56f6..58e901b 100644
--- a/arch/arm/lib/board.c
+++ b/arch/arm/lib/board.c
@@ -275,8 +275,11 @@ void board_init_f(ulong bootflag)
 
 	gd->mon_len = _bss_end_ofs;
 
+
 #ifdef CONFIG_MACH_TYPE
 	gd->bd->bi_arch_number = CONFIG_MACH_TYPE; /* board id for Linux */
+#else
+	gd->bd->bi_arch_number = BI_ARCH_NUMBER_INVALID;
 #endif
 
 	for (init_fnc_ptr = init_sequence; *init_fnc_ptr; ++init_fnc_ptr) {
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 802e833..d5fd26b 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -113,6 +113,9 @@ int do_bootm_linux(int flag, int argc, char *argv[], bootm_headers_t *images)
 		printf ("Using machid 0x%x from environment\n", machid);
 	}
 
+	if (machid == BI_ARCH_NUMBER_INVALID)
+		printf("Warning: machid not set.\n");
+
 	show_boot_progress (15);
 
 #ifdef CONFIG_OF_LIBFDT
-- 
1.7.4.5

  parent reply	other threads:[~2011-08-30 20:49 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-07-07 14:21 [U-Boot] [PATCH V2 0/4] make u-boot a bit easier for newcomers to port Christopher Harvey
2011-07-07 14:26 ` [U-Boot] [PATCH V2 1/4] Added documentation for CONFIG_SYS_TEXT_BASE Christopher Harvey
2011-08-04  6:20   ` Albert ARIBAUD
2011-08-24 18:34     ` Christopher Harvey
2011-08-24 19:12       ` Wolfgang Denk
2011-07-07 14:31 ` [U-Boot] [PATCH V2 2/4] Don't compile in large memory test function by default Christopher Harvey
2011-08-04  6:31   ` Albert ARIBAUD
2011-08-04 10:14     ` Wolfgang Denk
2011-08-04 10:54       ` Albert ARIBAUD
2011-08-04 10:20   ` Wolfgang Denk
2011-07-07 14:34 ` [U-Boot] [PATCH V2 3/4] ARM: Warn when the machine ID isn't set Christopher Harvey
2011-07-07 16:55   ` Igor Grinberg
2011-07-07 21:02     ` Igor Grinberg
2011-07-14 18:02   ` [U-Boot] [PATCH V3 " Christopher Harvey
2011-07-14 19:02     ` Igor Grinberg
2011-07-15 12:44       ` Stefano Babic
2011-07-17  6:53         ` Igor Grinberg
2011-07-17  8:26           ` stefano babic
2011-07-17  9:00             ` Albert ARIBAUD
2011-07-18 17:33     ` [U-Boot] [PATCH V4 " Christopher Harvey
2011-08-04  6:30       ` Albert ARIBAUD
2011-08-24 14:31         ` Albert ARIBAUD
2011-08-24 17:37           ` Christopher Harvey
2011-08-30 20:49       ` Christopher Harvey [this message]
2011-07-07 14:37 ` [U-Boot] [PATCH V2 4/4] Removed unused define, CONFIG_ARMV7 Christopher Harvey
2011-08-04  6:33   ` Albert ARIBAUD

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=20110830204935.GA7377@harvey-pc.matrox.com \
    --to=charvey@matrox.com \
    --cc=u-boot@lists.denx.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.