Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
L
lede-mikrotik
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Johannes Rudolph
lede-mikrotik
Commits
be59b171
Commit
be59b171
authored
8 years ago
by
Felix Fietkau
Browse files
Options
Downloads
Patches
Plain Diff
x86: drop the use of block2mtd, use ext4/f2fs as overlay filesystem
Signed-off-by:
Felix Fietkau
<
nbd@nbd.name
>
parent
c6eb09d5
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
target/linux/x86/image/Makefile
+2
-16
2 additions, 16 deletions
target/linux/x86/image/Makefile
with
2 additions
and
16 deletions
target/linux/x86/image/Makefile
+
2
−
16
View file @
be59b171
...
...
@@ -54,16 +54,8 @@ ifneq ($(CONFIG_GRUB_IMAGES),)
root
=
$(
ROOTPART
)
rootfstype
=
ext4 rootwait
endef
define
Image/cmdline/jffs2-64k
block2mtd.block2mtd
=
$(
ROOTPART
)
,65536,rootfs,5
root
=
/dev/mtdblock0
rootfstype
=
jffs2 rootwait
endef
define
Image/cmdline/jffs2-128k
block2mtd.block2mtd
=
$(
ROOTPART
)
,131072,rootfs,5
root
=
/dev/mtdblock0
rootfstype
=
jffs2 rootwait
endef
define
Image/cmdline/squashfs
block2mtd.block2mtd
=
$(
ROOTPART
)
,65536,rootfs,5
root
=
/dev/mtdblock0
rootfstype
=
squashfs rootwait
root
=
$(
ROOTPART
)
rootfstype
=
squashfs rootwait
endef
define
Image/Build/grub2
...
...
@@ -101,7 +93,7 @@ endif
ROOTDELAY
=
10
define
Image/Build/squashfs
$(
call
prepare_generic_squashfs,
$(
KDIR
)
/root.squashfs
)
dd
if
=
/dev/zero
bs
=
128k
count
=
1
>>
$(
KDIR
)
/root.squashfs
endef
define
Image/Build/iso
...
...
@@ -161,12 +153,6 @@ ifneq ($(CONFIG_TARGET_IMAGES_GZIP),)
define
Image/Build/gzip/squashfs
$(
call
Image/Build/gzip,squashfs
)
endef
define
Image/Build/gzip/jffs2-64k
$(
call
Image/Build/gzip,jffs2-64k
)
endef
define
Image/Build/gzip/jffs2-128k
$(
call
Image/Build/gzip,jffs2-128k
)
endef
endif
endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment