Commit Graph

80 Commits (5b5afc12c3c8d842b4955ab109a1ba92f931c5bc)

Author SHA1 Message Date
Felix Fietkau 550238fa72 x86: try harder to attach block2mtd to fix boot issues on devices with longer delays
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40444 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-04-10 14:43:17 +00:00
Imre Kaloz bb345ab0e8 move most of the x86 image generation options to the main file
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39206 3c298f89-4303-0410-b956-a3cf2f4a3e73
2014-01-07 10:18:55 +00:00
Imre Kaloz bc886ef909 For now vdi and vmdk images should be x86 only
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38896 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-22 14:39:53 +00:00
Imre Kaloz f23c2eafda [x86]: VMWare and VirtualBox images should select what they need, not depend on it..
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>



git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38892 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-22 09:54:36 +00:00
Imre Kaloz e88f8197cb [x86]: rationalize target image options
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
 


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38891 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-11-22 09:44:14 +00:00
Felix Fietkau d3c8499987 x86: Fix CONFIG_X86_GRUB_SERIAL=""
With

    .config:CONFIG_X86_GRUB_SERIAL=""

which (AFAICT) is the way to tell GRUB not to use a serial console, in

    target/linux/x86/image/Makefile:ifneq ($(CONFIG_X86_GRUB_SERIAL),)

$(CONFIG_X86_GRUB_SERIAL) expands to `""' (a literal double double-quote),
making the condition unconditionally false.

This patch fixes the situation by passing CONFIG_X86_GRUB_SERIAL through
qstrip before testing.

Signed-off-by: Tamas TEVESZ <ice@extreme.hu>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37749 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-08-10 18:35:29 +00:00
Florian Fainelli 704e2ed39d targets: prepare for supporting normal and initramfs images
In order to support both normal images and initramfs, ensure that each
target sets KERNELNAME properly so that the generic kernel building code
can copy the corresponding files over $(KDIR) with the appropriate
extension. Update the various paths to the kernel and wrapper images
from $(LINUX_DIR)/arch/$(ARCH)/boot/$(foo) to $(KDIR)/$(foo).

Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37049 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-06-27 19:58:31 +00:00
Felix Fietkau ab8468d344 build: consistently use 'depends on' instead of 'depends'
make the syntax more compatible with kernel menuconfig

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36351 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-04-17 15:36:41 +00:00
Jo-Philipp Wich 29f2452461 x86: explicitely pass staging directory to grub-mkimage instead of relying on build time defaults (#12821)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35200 3c298f89-4303-0410-b956-a3cf2f4a3e73
2013-01-17 15:46:26 +00:00
Felix Fietkau 114523d5b7 x86: use $(strip) for the at_keyboard check
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34127 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-11-09 10:53:36 +00:00
Felix Fietkau ce5e0d1df8 x86: only enable at_keyboard for the generic and kvm_guest subtargets to avoid hangs on alix2 and others (thx, russell)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34126 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-11-09 10:19:51 +00:00
Florian Fainelli 86148ac69b [x86] merge the RDC R-321x target as a subtarget of x86
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33779 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-15 18:54:34 +00:00
Felix Fietkau 065c949674 x86: remove the reboot=bios command line parameter (#12193)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33671 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-09 15:20:11 +00:00
Felix Fietkau 56803b05a0 x86: rename the iso file to openwrt-x86-generic.iso
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33641 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-07 23:05:39 +00:00
Felix Fietkau 7bb6460a5d x86: remove grub-legacy
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33640 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-07 23:01:56 +00:00
Felix Fietkau ea575c9316 x86: add grub2 iso support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33639 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-10-07 23:01:52 +00:00
Felix Fietkau 4fe0549e77 x86: avoid using grub prepare when using grub2
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33525 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-09-23 09:59:56 +00:00
Felix Fietkau b043edb3d5 x86: add support for building grub2 images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33513 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-09-22 20:10:42 +00:00
Felix Fietkau 7bec5b7dd4 x86: split generic image building into a separate script
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33511 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-09-22 20:10:35 +00:00
Felix Fietkau 4650f24b21 x86: rename gen_image_x86.sh to gen_image_grub.sh
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33510 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-09-22 20:10:31 +00:00
Jo-Philipp Wich b9a5139dc5 [x86] use ttyS0 @ 115200 baud as default for KVM guests
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32384 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-06-15 12:59:49 +00:00
Gabor Juhos 0a3596481b x86: image: select bootscript images by default for OLPC
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31783 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-05-18 09:57:29 +00:00
Jo-Philipp Wich b4b7a17e19 PATCH: Disable console terminal in Grub for alix2 target
The alix2 target has the VGA console for grub enabled by default. This
prevents the grub menu from appearing on bootup. It is disabled by
default for the other embedded x86 platforms. This patch corrects that
behavior for the alix2 target.

Signed-off-by: Adam Gensler <openwrt@kristenandadam.net>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31270 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-04-12 23:30:27 +00:00
Vasilis Tsiligiannis 66806831eb [x86] Disable by default padding of images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30590 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-02-16 17:54:07 +00:00
Vasilis Tsiligiannis f96dd212f5 [x86] Allow gzipping of squashfs images with padded jffs2 partition
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30589 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-02-16 17:54:04 +00:00
Vasilis Tsiligiannis c326fbec1a [x86] GZip only ext4 and padded images
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30588 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-02-16 17:54:01 +00:00
Vasilis Tsiligiannis 7cb3f70eea [x86] Make gzipping of images configurable via menuconfig
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30587 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-02-16 17:53:57 +00:00
Jo-Philipp Wich d3cae4c425 Make the grub timeout configurable on x86 targets
Signed-off-by: Justus Winter <4winter@informatik.uni-hamburg.de>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29786 3c298f89-4303-0410-b956-a3cf2f4a3e73
2012-01-19 01:14:45 +00:00
Nicolas Thill 59bf9e97fa [target] x86: allow VDI & VMDK images for all subtargets (closes: #10255)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28518 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-10-22 13:09:15 +00:00
John Crispin f7044753af [x86]
* adds support for Artec Thincan

Signed-of-By: Lauri Võsandi <lauri.vosandi@gmail.com>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26919 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-05-17 10:35:14 +00:00
Daniel Dickinson 6c5f918ef1 This patch provides an image suitable for the alix2*, alix3, and alix6 headless (non-VGA equipped) SBC's.
Note that the Alix6 uses GPIO 27 to disable wireless transmit (W_DIS#), whereas on all other versions this is used to actuate the speaker.

GPIO 1 : SIM select (Alix6)
GPIO 6 : LED1
GPIO 25 : LED2
GPIO 27 : LED3 or RFKILL (Alix6)

GPIO 24 : Soft switch 1

No kernel version bump.  Added i2c-scx200-acb for lm-sensors support.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26879 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-05-13 06:06:42 +00:00
Jo-Philipp Wich af192f49ce [x86] gzip jffs2 images
Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26625 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-12 20:48:47 +00:00
Jo-Philipp Wich 4c7ebaeff5 Enable padding of jffs2 images to user specified filesystem size
Signed-off-by: Vasilis Tsiligiannis <b_tsiligiannis@silverton.gr>


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26624 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-04-12 20:46:34 +00:00
John Crispin 953ddaaba7 [geos]
* Make sure that Geos baud-rate defaults	correctly
  Changeset 23414 somehow got reordered.  The unconditional default trumps later settings.

contributed by Philip Prindeville


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25068 3c298f89-4303-0410-b956-a3cf2f4a3e73
2011-01-22 23:10:51 +00:00
Imre Kaloz c1725149e1 switch from ext2 to ext4 (w/o) journaling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24084 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-11-22 12:12:39 +00:00
Alexandros C. Couloumbis 5fe6b2b482 target/linux: fix Geos baudrate. (thank you Philip Prindeville)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23414 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-12 15:27:34 +00:00
Jo-Philipp Wich e9b7a65dec [Patch v2] Geos -- new x86 subtarget definition
This defines the Geos platform from Traverse Technologies in AUS.

This is a Geode LX800 with 512MB of DDR400 memory, 2 8139CP interfaces, 2 Solos ADSL2+ interfaces, USB, serial console, CF slot, and miniPCI slot.

I'll add support for the LEDs separately.

Signed-off-by: Philip A. Prindeville 


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23390 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-10-10 22:48:33 +00:00
Jo-Philipp Wich b9be9c0ce2 [x86] adjust image defaults for KVM
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22950 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-09-06 02:31:37 +00:00
Andy Boyett 1ab07cd99b [x86] image: use internal qemu-img for vmdk and vdi images
drop host dependencies on qemu-utils and VirtualBox

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22553 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-08-09 04:22:39 +00:00
Felix Fietkau 12abbd4d08 x86: build fully functional images on Mac OS X, now that grub is fixed
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21609 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-28 19:48:21 +00:00
Nicolas Thill c0eb3b3611 image/x86: fix typo when building on Mac OS X (closes: #7303)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21401 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-08 12:46:25 +00:00
Nicolas Thill d6cfedc7ca target/x86: cleanup image config options
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21365 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 02:11:15 +00:00
Nicolas Thill 711491bad1 target/x86: use common config items for options shared between generic and olpc targets
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21364 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 02:07:38 +00:00
Nicolas Thill 560f2614b5 images: rename CONFIG_TARGET_ROOTFS_FSPART to CONFIG_TARGET_ROOTFS_PARTSIZE
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21362 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-05 01:52:54 +00:00
Nicolas Thill 443cf0e427 package/grub: build a host grub and a target grub (#7269)
- use the host grub binary for grub install, but with target stage files
 - disable SSP (-fno-stack-protector) & Compile Time Buffer Checks (-U_FORTIFY_SOURCE) if appropriate
 - create a target grub package


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21305 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-05-02 17:32:25 +00:00
Nicolas Thill 8aea0611d9 target/x86: add to changes missed from [21246] preventing .vdi & .vmdk image generation
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21277 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-30 18:43:39 +00:00
Nicolas Thill ac838e71ff target/x86: various image changes
* add a -combined suffix for grub+kernel+rootfs images and -rootfs for root filesystem only images
 * change ext from .image to .img
 * fix perms on VirtualBox .vdi image
 * gzip ext2 rootfs image as well


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21246 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-29 03:03:47 +00:00
Nicolas Thill dd725d483d target/x86: rearrange image Makefile, indent, reorder, simplify, change some ifeq/ifneq tests
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21245 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-29 00:47:05 +00:00
Nicolas Thill 3859ef2537 target/x86: remove temporary files in image generation scripts
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21243 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-29 00:41:22 +00:00
Nicolas Thill b1c612578a replace old quote stripping with calls to qstrip macro
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21242 3c298f89-4303-0410-b956-a3cf2f4a3e73
2010-04-29 00:32:44 +00:00