diff options
-rw-r--r-- | common/Makefile | 4 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/bin/bootargs-ip (renamed from defaultenv-2/base/bin/bootargs-ip) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/bin/ifup (renamed from defaultenv-2/base/bin/ifup) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/bin/init (renamed from defaultenv-2/base/bin/init) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/bin/mtdparts-add (renamed from defaultenv-2/base/bin/mtdparts-add) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/boot/net (renamed from defaultenv-2/base/boot/net) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/config (renamed from defaultenv-2/base/config) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/data/ansi-colors (renamed from defaultenv-2/base/data/ansi-colors) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/data/boot-template (renamed from defaultenv-2/base/data/boot-template) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/init/automount (renamed from defaultenv-2/base/init/automount) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/init/ps1 (renamed from defaultenv-2/base/init/ps1) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-base/network/eth0 (renamed from defaultenv-2/base/network/eth0) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-menu/menu/boot-entries-collect (renamed from defaultenv-2/menu/menu/boot-entries-collect) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-menu/menu/boot-entries-edit (renamed from defaultenv-2/menu/menu/boot-entries-edit) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-menu/menu/boot-entries-remove (renamed from defaultenv-2/menu/menu/boot-entries-remove) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-menu/menu/boot-menu-add-entry (renamed from defaultenv-2/menu/menu/boot-menu-add-entry) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-menu/menu/boot-menu-new-boot-entry (renamed from defaultenv-2/menu/menu/boot-menu-new-boot-entry) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-menu/menu/init-entries-collect (renamed from defaultenv-2/menu/menu/init-entries-collect) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-menu/menu/init-entries-edit (renamed from defaultenv-2/menu/menu/init-entries-edit) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-menu/menu/init-menu-add-entry (renamed from defaultenv-2/menu/menu/init-menu-add-entry) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-menu/menu/mainmenu (renamed from defaultenv-2/menu/menu/mainmenu) | 0 | ||||
-rw-r--r-- | defaultenv/defaultenv-2-menu/menu/settings (renamed from defaultenv-2/menu/menu/settings) | 0 |
22 files changed, 2 insertions, 2 deletions
diff --git a/common/Makefile b/common/Makefile index c88d1c6f63..9c68f7b466 100644 --- a/common/Makefile +++ b/common/Makefile @@ -51,9 +51,9 @@ $(obj)/startup.o: $(obj)/barebox_default_env.h $(obj)/env.o: $(obj)/barebox_default_env.h ifeq ($(CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW),y) -DEFAULT_ENVIRONMENT_PATH = "defaultenv-2/base" +DEFAULT_ENVIRONMENT_PATH = "defaultenv/defaultenv-2-base" ifeq ($(CONFIG_CMD_MENU_MANAGEMENT),y) -DEFAULT_ENVIRONMENT_PATH += "defaultenv-2/menu" +DEFAULT_ENVIRONMENT_PATH += "defaultenv/defaultenv-2-menu" endif endif diff --git a/defaultenv-2/base/bin/bootargs-ip b/defaultenv/defaultenv-2-base/bin/bootargs-ip index 2d4486caf8..2d4486caf8 100644 --- a/defaultenv-2/base/bin/bootargs-ip +++ b/defaultenv/defaultenv-2-base/bin/bootargs-ip diff --git a/defaultenv-2/base/bin/ifup b/defaultenv/defaultenv-2-base/bin/ifup index 37b986c44b..37b986c44b 100644 --- a/defaultenv-2/base/bin/ifup +++ b/defaultenv/defaultenv-2-base/bin/ifup diff --git a/defaultenv-2/base/bin/init b/defaultenv/defaultenv-2-base/bin/init index 3a0e93b49d..3a0e93b49d 100644 --- a/defaultenv-2/base/bin/init +++ b/defaultenv/defaultenv-2-base/bin/init diff --git a/defaultenv-2/base/bin/mtdparts-add b/defaultenv/defaultenv-2-base/bin/mtdparts-add index 58c9fa7a21..58c9fa7a21 100644 --- a/defaultenv-2/base/bin/mtdparts-add +++ b/defaultenv/defaultenv-2-base/bin/mtdparts-add diff --git a/defaultenv-2/base/boot/net b/defaultenv/defaultenv-2-base/boot/net index 05bb728fa1..05bb728fa1 100644 --- a/defaultenv-2/base/boot/net +++ b/defaultenv/defaultenv-2-base/boot/net diff --git a/defaultenv-2/base/config b/defaultenv/defaultenv-2-base/config index 784ae52b80..784ae52b80 100644 --- a/defaultenv-2/base/config +++ b/defaultenv/defaultenv-2-base/config diff --git a/defaultenv-2/base/data/ansi-colors b/defaultenv/defaultenv-2-base/data/ansi-colors index 636532979a..636532979a 100644 --- a/defaultenv-2/base/data/ansi-colors +++ b/defaultenv/defaultenv-2-base/data/ansi-colors diff --git a/defaultenv-2/base/data/boot-template b/defaultenv/defaultenv-2-base/data/boot-template index 9297499036..9297499036 100644 --- a/defaultenv-2/base/data/boot-template +++ b/defaultenv/defaultenv-2-base/data/boot-template diff --git a/defaultenv-2/base/init/automount b/defaultenv/defaultenv-2-base/init/automount index fe56d920e7..fe56d920e7 100644 --- a/defaultenv-2/base/init/automount +++ b/defaultenv/defaultenv-2-base/init/automount diff --git a/defaultenv-2/base/init/ps1 b/defaultenv/defaultenv-2-base/init/ps1 index 02d7b4b780..02d7b4b780 100644 --- a/defaultenv-2/base/init/ps1 +++ b/defaultenv/defaultenv-2-base/init/ps1 diff --git a/defaultenv-2/base/network/eth0 b/defaultenv/defaultenv-2-base/network/eth0 index 7e731cae00..7e731cae00 100644 --- a/defaultenv-2/base/network/eth0 +++ b/defaultenv/defaultenv-2-base/network/eth0 diff --git a/defaultenv-2/menu/menu/boot-entries-collect b/defaultenv/defaultenv-2-menu/menu/boot-entries-collect index c066c930ab..c066c930ab 100644 --- a/defaultenv-2/menu/menu/boot-entries-collect +++ b/defaultenv/defaultenv-2-menu/menu/boot-entries-collect diff --git a/defaultenv-2/menu/menu/boot-entries-edit b/defaultenv/defaultenv-2-menu/menu/boot-entries-edit index c4e1c3d5fd..c4e1c3d5fd 100644 --- a/defaultenv-2/menu/menu/boot-entries-edit +++ b/defaultenv/defaultenv-2-menu/menu/boot-entries-edit diff --git a/defaultenv-2/menu/menu/boot-entries-remove b/defaultenv/defaultenv-2-menu/menu/boot-entries-remove index 566be9dd6e..566be9dd6e 100644 --- a/defaultenv-2/menu/menu/boot-entries-remove +++ b/defaultenv/defaultenv-2-menu/menu/boot-entries-remove diff --git a/defaultenv-2/menu/menu/boot-menu-add-entry b/defaultenv/defaultenv-2-menu/menu/boot-menu-add-entry index f06c524034..f06c524034 100644 --- a/defaultenv-2/menu/menu/boot-menu-add-entry +++ b/defaultenv/defaultenv-2-menu/menu/boot-menu-add-entry diff --git a/defaultenv-2/menu/menu/boot-menu-new-boot-entry b/defaultenv/defaultenv-2-menu/menu/boot-menu-new-boot-entry index c5e982cdb2..c5e982cdb2 100644 --- a/defaultenv-2/menu/menu/boot-menu-new-boot-entry +++ b/defaultenv/defaultenv-2-menu/menu/boot-menu-new-boot-entry diff --git a/defaultenv-2/menu/menu/init-entries-collect b/defaultenv/defaultenv-2-menu/menu/init-entries-collect index dbb775779a..dbb775779a 100644 --- a/defaultenv-2/menu/menu/init-entries-collect +++ b/defaultenv/defaultenv-2-menu/menu/init-entries-collect diff --git a/defaultenv-2/menu/menu/init-entries-edit b/defaultenv/defaultenv-2-menu/menu/init-entries-edit index fc02b327d9..fc02b327d9 100644 --- a/defaultenv-2/menu/menu/init-entries-edit +++ b/defaultenv/defaultenv-2-menu/menu/init-entries-edit diff --git a/defaultenv-2/menu/menu/init-menu-add-entry b/defaultenv/defaultenv-2-menu/menu/init-menu-add-entry index 7cb5686402..7cb5686402 100644 --- a/defaultenv-2/menu/menu/init-menu-add-entry +++ b/defaultenv/defaultenv-2-menu/menu/init-menu-add-entry diff --git a/defaultenv-2/menu/menu/mainmenu b/defaultenv/defaultenv-2-menu/menu/mainmenu index f10f67a62f..f10f67a62f 100644 --- a/defaultenv-2/menu/menu/mainmenu +++ b/defaultenv/defaultenv-2-menu/menu/mainmenu diff --git a/defaultenv-2/menu/menu/settings b/defaultenv/defaultenv-2-menu/menu/settings index db619afa6f..db619afa6f 100644 --- a/defaultenv-2/menu/menu/settings +++ b/defaultenv/defaultenv-2-menu/menu/settings |