Merge remote-tracking branch 'u-boot-atmel/master'

[u-boot] / arch / sandbox / cpu / u-boot.lds

diff --git a/arch/sandbox/cpu/u-boot.lds b/arch/sandbox/cpu/u-boot.lds
index 2d2e50fdbf429a60f4ebb6668b2bb373b84a7b07..1b781ebf6ac17df8539f98e8a750d48a9ec5dde9 100644 (file)
--- a/arch/sandbox/cpu/u-boot.lds
+++ b/arch/sandbox/cpu/u-boot.lds
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 The Chromium OS Authors.
+ * Copyright (c) 2011-2012 The Chromium OS Authors.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  *
@@ -24,11 +24,17 @@
 
 SECTIONS
 {
-  __u_boot_cmd_start = .;
-  .u_boot_cmd : { *(.u_boot_cmd) }
-  __u_boot_cmd_end = .;
-  __bss_start = .;
 
+       . = ALIGN(4);
+       .u_boot_list : {
+       #include <u-boot.lst>
+       }
+
+       __u_boot_sandbox_option_start = .;
+       _u_boot_sandbox_getopt : { *(.u_boot_sandbox_getopt) }
+       __u_boot_sandbox_option_end = .;
+
+       __bss_start = .;
 }
 
 INSERT BEFORE .data;