Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
n9: fix for no boot when boot loader passes omapdss.def_disp_enabled=1
When bootloader passes omapdss.def_disp_enabled=1 to kernel it's saying
"no need to reset the default display - I did it already". For some
reason this causes booting to fail.
By commenting out module parameter kernel always resets display on boot
and that fixes the problem. This allows for removing CONFIG_CMDLINE_FORCE=y
and getting in all other parameters bootloader provides (battery info, mtd
partitions...)

Signed-off-by: Filip Matijević <filip.matijevic.pz@gmail.com>
  • Loading branch information
filippz committed Sep 28, 2013
1 parent 4efa1c1 commit 33f7bb0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion arch/arm/configs/n9_mer_defconfig
Expand Up @@ -486,7 +486,7 @@ CONFIG_ZBOOT_ROM_BSS=0x0
CONFIG_CMDLINE="root=/dev/mmcblk0p4 rootwait console=ttyO2,115200"
# CONFIG_CMDLINE_FROM_BOOTLOADER is not set
# CONFIG_CMDLINE_EXTEND is not set
CONFIG_CMDLINE_FORCE=y
# CONFIG_CMDLINE_FORCE is not set
# CONFIG_XIP_KERNEL is not set
CONFIG_KEXEC=y
CONFIG_ATAGS_PROC=y
Expand Down
5 changes: 3 additions & 2 deletions drivers/video/omap2/dss/core.c
Expand Up @@ -69,9 +69,10 @@ MODULE_PARM_DESC(def_disp_name, "default display name");
* boot up, by bootloader.
* Parameter full name is omapdss.def_disp_enabled.
*/
static unsigned int def_disp_enabled;
static unsigned int def_disp_enabled=0;
/* FIXME ubiboot passes omapdss.def_disp_enabled=1 but that prevents kernel from booting
module_param(def_disp_enabled, bool, 0);
MODULE_PARM_DESC(def_disp_enabled, "default display is enabled");
MODULE_PARM_DESC(def_disp_enabled, "default display is enabled");*/

#ifdef DEBUG
unsigned int dss_debug;
Expand Down

0 comments on commit 33f7bb0

Please sign in to comment.